10 Commits
Author SHA1 Message Date
sbstp f24d8aa062 vendor assets with versionning
ci/woodpecker/tag/release Pipeline was successful
2026-08-08 12:21:33 -04:00
sbstp 5233b1e6fd real-time list counts 2026-08-08 11:36:28 -04:00
sbstp ff9f679fcb proper closing of sqlite connection
ci/woodpecker/push/e2e Pipeline was successful
ci/woodpecker/push/fmt Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
2026-08-07 23:27:49 -04:00
sbstp a13bc17629 use memory databases for e2e tests 2026-08-07 23:20:27 -04:00
sbstp f480407927 update htmx to latest in 2.x branch
ci/woodpecker/push/e2e Pipeline was successful
ci/woodpecker/push/fmt Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
2026-08-07 22:53:42 -04:00
sbstp 9267786371 cargo fmt
ci/woodpecker/push/fmt Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
ci/woodpecker/push/e2e Pipeline was canceled
2026-08-07 22:49:50 -04:00
sbstp e24f4ff7e2 archived list count 2026-08-07 22:49:31 -04:00
sbstp 56cd6e32e9 hx boost + bug fix 2026-08-07 22:46:53 -04:00
sbstp 689bd95ff0 list archive
ci/woodpecker/push/e2e Pipeline was successful
ci/woodpecker/push/fmt Pipeline failed
ci/woodpecker/push/test Pipeline was successful
2026-08-07 22:16:29 -04:00
sbstp 240d993d57 improve ux 2026-08-07 21:42:38 -04:00
16 changed files with 730 additions and 154 deletions
+5 -19
View File
@@ -1,13 +1,12 @@
import { test as base, expect, Page } from "@playwright/test"; import { test as base, expect, Page } from "@playwright/test";
import { spawn, ChildProcess } from "child_process"; import { spawn, ChildProcess } from "child_process";
import * as fs from "fs";
import * as os from "os"; import * as os from "os";
import * as path from "path"; import * as path from "path";
/** /**
* Starts a fresh Sustenance server against a unique, throwaway database on a * Starts a fresh Sustenance server against an in-memory SQLite database on a
* unique port for each test, and tears it down afterwards. This gives every * unique port for each test, and tears it down afterwards. Every test gets a
* test a clean DB with no shared state between tests. * clean DB with no shared state between tests, and nothing is written to disk.
*/ */
export const test = base.extend<{ server: { baseURL: string }; page: Page }>({ export const test = base.extend<{ server: { baseURL: string }; page: Page }>({
server: [ server: [
@@ -15,10 +14,6 @@ export const test = base.extend<{ server: { baseURL: string }; page: Page }>({
const server = await startServer(); const server = await startServer();
await use({ baseURL: server.baseURL }); await use({ baseURL: server.baseURL });
await killTree(server.child); await killTree(server.child);
// Clean up the DB files (including -wal / -shm).
for (const suffix of ["", "-wal", "-shm"]) {
fs.rmSync(server.dbPath + suffix, { force: true });
}
}, },
{ scope: "test", auto: true }, { scope: "test", auto: true },
], ],
@@ -35,12 +30,6 @@ export const test = base.extend<{ server: { baseURL: string }; page: Page }>({
/** Starts a server, retrying on a fresh port if the first attempt fails to bind. */ /** Starts a server, retrying on a fresh port if the first attempt fails to bind. */
async function startServer() { async function startServer() {
for (let attempt = 0; attempt < 5; attempt++) { for (let attempt = 0; attempt < 5; attempt++) {
const dbPath = path.join(
os.tmpdir(),
`sustenance-e2e-${process.pid}-${Date.now()}-${Math.random()
.toString(36)
.slice(2)}.db`,
);
const port = 20000 + Math.floor(Math.random() * 30000); const port = 20000 + Math.floor(Math.random() * 30000);
const baseURL = `http://localhost:${port}`; const baseURL = `http://localhost:${port}`;
@@ -50,7 +39,7 @@ async function startServer() {
{ {
env: { env: {
...process.env, ...process.env,
DATABASE_PATH: dbPath, DATABASE_IN_MEMORY: "1",
REGISTRATION_MODE: "open", REGISTRATION_MODE: "open",
BIND_ADDRESS: `127.0.0.1:${port}`, BIND_ADDRESS: `127.0.0.1:${port}`,
PUBLIC_BASE_URL: baseURL, PUBLIC_BASE_URL: baseURL,
@@ -72,13 +61,10 @@ async function startServer() {
try { try {
await waitForServer(baseURL, child); await waitForServer(baseURL, child);
return { baseURL, child, dbPath }; return { baseURL, child };
} catch (error) { } catch (error) {
// The server may have failed to bind (port collision). Clean up and retry. // The server may have failed to bind (port collision). Clean up and retry.
await killTree(child); await killTree(child);
for (const suffix of ["", "-wal", "-shm"]) {
fs.rmSync(dbPath + suffix, { force: true });
}
if (attempt === 4) { if (attempt === 4) {
throw new Error( throw new Error(
`server failed to start after retries; last stderr:\n${stderr}\n${error}`, `server failed to start after retries; last stderr:\n${stderr}\n${error}`,
+83
View File
@@ -0,0 +1,83 @@
import { expect } from "@playwright/test";
import { test } from "../fixtures";
import { registerAndLogin, createList, addItem } from "../helpers";
test("a user can archive a list and it moves to the archive page", async ({ page }) => {
await registerAndLogin(page, "alice@example.com");
await createList(page, "Weekly shop");
// Archive from the list page.
await page.click('button:has-text("Archive")');
// Lands back on the lists page; the list is no longer shown.
await expect(page).toHaveURL(/\/lists/);
await expect(page.locator(".list-card").filter({ hasText: "Weekly shop" })).toHaveCount(0);
// The archived list is reachable from the archive page.
await page.goto("/archive");
await expect(page.locator(".list-card").filter({ hasText: "Weekly shop" })).toBeVisible();
});
test("the lists frame links to the archive page", async ({ page }) => {
await registerAndLogin(page, "alice@example.com");
await createList(page, "Weekly shop");
await page.goto("/lists");
await page.click('a.archive-link');
await expect(page).toHaveURL(/\/archive/);
});
test("an archived list is read-only", async ({ page }) => {
await registerAndLogin(page, "alice@example.com");
await createList(page, "Weekly shop");
await addItem(page, "Apple");
await page.click('button:has-text("Archive")');
// Open the archived list directly.
await page.goto("/archive");
await page.locator(".list-card").filter({ hasText: "Weekly shop" }).click();
await expect(page).toHaveURL(/\/lists\/\d+/);
// The item is still visible.
await expect(page.locator(".item-row").filter({ hasText: "Apple" })).toBeVisible();
// No mutation UI is present.
await expect(page.locator("#add-item-form")).toHaveCount(0);
await expect(page.locator(".item-actions-button")).toHaveCount(0);
await expect(page.locator(".check-form")).toHaveCount(0);
await expect(page.locator('button:has-text("+ Add meal")')).toHaveCount(0);
});
test("a user can restore an archived list and edit it again", async ({ page }) => {
await registerAndLogin(page, "alice@example.com");
await createList(page, "Weekly shop");
await addItem(page, "Apple");
await page.click('button:has-text("Archive")');
// Open the archived list and restore it.
await page.goto("/archive");
await page.locator(".list-card").filter({ hasText: "Weekly shop" }).click();
await page.click('button:has-text("Restore")');
// Back on the lists page, the list is active again.
await expect(page).toHaveURL(/\/lists/);
await expect(page.locator(".list-card").filter({ hasText: "Weekly shop" })).toBeVisible();
// The list is editable again.
await page.locator(".list-card").filter({ hasText: "Weekly shop" }).click();
await expect(page.locator("#add-item-form")).toBeVisible();
await addItem(page, "Banana");
await expect(page.locator(".item-row").filter({ hasText: "Banana" })).toBeVisible();
});
test("the archive page shows the list name and created date", async ({ page }) => {
await registerAndLogin(page, "alice@example.com");
await createList(page, "Weekly shop");
await page.click('button:has-text("Archive")');
await page.goto("/archive");
const card = page.locator(".list-card").filter({ hasText: "Weekly shop" });
await expect(card).toBeVisible();
// The card shows a created date (e.g. "Created 7 Aug 2026").
await expect(card.locator("small")).toContainText("Created");
});
+1
View File
@@ -32,6 +32,7 @@ test("a user can delete a meal", async ({ page }) => {
await registerAndLogin(page, "alice@example.com"); await registerAndLogin(page, "alice@example.com");
await createMeal(page, "Spaghetti Bolognese", ""); await createMeal(page, "Spaghetti Bolognese", "");
page.on("dialog", (dialog) => dialog.accept());
await page.click('button:has-text("Delete")'); await page.click('button:has-text("Delete")');
await expect(page).toHaveURL(/\/meals$/); await expect(page).toHaveURL(/\/meals$/);
await expect(page.locator(".list-card").filter({ hasText: "Spaghetti Bolognese" })).toHaveCount(0); await expect(page.locator(".list-card").filter({ hasText: "Spaghetti Bolognese" })).toHaveCount(0);
+13
View File
@@ -20,12 +20,25 @@ test("a list updates live for another user via websocket", async ({ page, browse
// Give the websocket connections a moment to establish. // Give the websocket connections a moment to establish.
await page.waitForTimeout(500); await page.waitForTimeout(500);
// Both start with an empty list.
await expect(pageB.locator("#list-meta")).toHaveText("0 items left out of 0");
// User A adds an item. // User A adds an item.
await addItem(page, "Apple", "2"); await addItem(page, "Apple", "2");
// It should appear on User B's page without any reload. // It should appear on User B's page without any reload.
await expect(pageB.locator(".item-row").filter({ hasText: "Apple" })).toBeVisible(); await expect(pageB.locator(".item-row").filter({ hasText: "Apple" })).toBeVisible();
await expect(pageB.locator(".item-row").filter({ hasText: "Apple" }).locator(".item-qty")).toHaveText("(2)"); await expect(pageB.locator(".item-row").filter({ hasText: "Apple" }).locator(".item-qty")).toHaveText("(2)");
// The left/total count should also update live for User B.
await expect(pageB.locator("#list-meta")).toHaveText("1 items left out of 1");
// User A removes the item.
await page.locator(".item-actions-button").first().click();
await page.locator("[id^='item-edit-delete']").click();
// The item and the count should update live on User B's page.
await expect(pageB.locator(".item-row").filter({ hasText: "Apple" })).toHaveCount(0);
await expect(pageB.locator("#list-meta")).toHaveText("0 items left out of 0");
await contextB.close(); await contextB.close();
}); });
@@ -0,0 +1 @@
ALTER TABLE lists ADD COLUMN archived_at INTEGER;
+79
View File
@@ -0,0 +1,79 @@
use std::collections::HashMap;
use std::sync::LazyLock;
use sha2::{Digest, Sha256};
/// A single static asset: its embedded bytes and a content hash used to
/// version its URL.
pub struct StaticAsset {
pub data: &'static [u8],
pub hash: String,
}
/// A registry of the app's static assets, keyed by filename. Each asset's
/// content hash is computed once on first use and cached, so the versioned URL
/// changes automatically whenever the underlying file changes.
pub struct StaticAssetStore {
assets: HashMap<&'static str, StaticAsset>,
}
impl StaticAssetStore {
fn new(entries: &[(&'static str, &'static [u8])]) -> Self {
let assets = entries
.iter()
.map(|(name, data)| {
let hash = content_hash(data);
(*name, StaticAsset { data, hash })
})
.collect();
Self { assets }
}
/// Looks up an asset by its filename (e.g. `"style.css"`).
pub fn get(&self, name: &str) -> Option<&StaticAsset> {
self.assets.get(name)
}
/// Returns the versioned URL for an asset, e.g. `/static/style.css?v=<hash>`.
pub fn url(&self, name: &str) -> Option<String> {
self.assets
.get(name)
.map(|asset| format!("/static/{name}?v={}", asset.hash))
}
}
fn content_hash(data: &[u8]) -> String {
let mut hasher = Sha256::new();
hasher.update(data);
hex::encode(hasher.finalize())
}
/// Constructs a `StaticAssetStore` from `name => path` pairs, embedding each
/// file's bytes at compile time via `include_bytes!`.
macro_rules! static_assets {
($($name:literal => $path:literal),* $(,)?) => {
StaticAssetStore::new(&[
$(($name, include_bytes!($path))),*
])
};
}
/// The app's static assets, loaded once on first use.
pub static STORE: LazyLock<StaticAssetStore> = LazyLock::new(|| {
static_assets! {
"style.css" => "../static/style.css",
"passkey-login.js" => "../static/passkey-login.js",
"passkey-register.js" => "../static/passkey-register.js",
"password-toggle.js" => "../static/password-toggle.js",
"htmx.min.js" => "../static/htmx.min.js",
"htmx-ws.min.js" => "../static/htmx-ws.min.js",
}
});
/// Returns the versioned URL for a known asset, panicking if the name isn't
/// registered (a programmer error, since these are compile-time constants).
pub fn url(name: &str) -> String {
STORE
.url(name)
.unwrap_or_else(|| panic!("unknown static asset: {name}"))
}
+4
View File
@@ -48,6 +48,10 @@ pub struct GroceryList {
pub id: i64, pub id: i64,
pub name: String, pub name: String,
pub revision: i64, pub revision: i64,
/// Unix timestamp of when the list was created.
pub created_at: i64,
/// Unix timestamp of when the list was archived; `None` when active.
pub archived_at: Option<i64>,
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
+92 -22
View File
@@ -20,19 +20,13 @@ use thiserror::Error;
use tower_http::trace::{DefaultMakeSpan, DefaultOnResponse, TraceLayer}; use tower_http::trace::{DefaultMakeSpan, DefaultOnResponse, TraceLayer};
use tracing::{Level, error, warn}; use tracing::{Level, error, warn};
use crate::assets;
use crate::domain::{DomainError, SessionUser}; use crate::domain::{DomainError, SessionUser};
use crate::ports::{HubEvent, RealtimeNotifier}; use crate::ports::{HubEvent, RealtimeNotifier};
use crate::services::{AuthService, InvitationService, ListService, MealService}; use crate::services::{AuthService, InvitationService, ListService, MealService};
use crate::views; use crate::views;
use crate::webauthn::WebAuthnService; use crate::webauthn::WebAuthnService;
/// The contents of `static/`, embedded into the binary at compile time so the
/// app can be shipped as a single executable without a separate static directory.
const STYLE_CSS: &[u8] = include_bytes!("../static/style.css");
const PASSKEY_LOGIN_JS: &[u8] = include_bytes!("../static/passkey-login.js");
const PASSKEY_REGISTER_JS: &[u8] = include_bytes!("../static/passkey-register.js");
const PASSWORD_TOGGLE_JS: &[u8] = include_bytes!("../static/password-toggle.js");
#[derive(Clone)] #[derive(Clone)]
pub struct AppState { pub struct AppState {
pub auth: Arc<AuthService>, pub auth: Arc<AuthService>,
@@ -53,6 +47,8 @@ pub enum AppError {
BadRequest(String), BadRequest(String),
#[error("not found")] #[error("not found")]
NotFound, NotFound,
#[error("list is archived")]
Archived,
} }
impl IntoResponse for AppError { impl IntoResponse for AppError {
@@ -72,6 +68,10 @@ impl IntoResponse for AppError {
StatusCode::NOT_FOUND, StatusCode::NOT_FOUND,
views::error_page("404", "That page could not be found."), views::error_page("404", "That page could not be found."),
), ),
AppError::Archived => status_html_response(
StatusCode::CONFLICT,
views::error_page("409", "This list is archived and cannot be modified."),
),
} }
} }
} }
@@ -96,7 +96,10 @@ pub fn build_router(state: AppState) -> Router {
) )
.route("/account/password", post(change_password)) .route("/account/password", post(change_password))
.route("/lists", get(lists_page).post(create_list)) .route("/lists", get(lists_page).post(create_list))
.route("/archive", get(archive_page))
.route("/lists/{list_id}", get(list_page)) .route("/lists/{list_id}", get(list_page))
.route("/lists/{list_id}/archive", post(archive_list))
.route("/lists/{list_id}/unarchive", post(unarchive_list))
.route("/lists/{list_id}/items", post(add_item)) .route("/lists/{list_id}/items", post(add_item))
.route("/lists/{list_id}/items/{item_id}/check", post(check_item)) .route("/lists/{list_id}/items/{item_id}/check", post(check_item))
.route("/lists/{list_id}/items/{item_id}/edit", post(edit_item)) .route("/lists/{list_id}/items/{item_id}/edit", post(edit_item))
@@ -331,15 +334,24 @@ async fn home() -> Redirect {
} }
/// Serves a file embedded in the binary from the `static/` folder. /// Serves a file embedded in the binary from the `static/` folder.
///
/// Every asset is served with an immutable, long-lived cache header. Because
/// the HTML references each asset under a URL that is versioned by its content
/// hash, a changed file gets a new URL and the cache is never stale.
async fn static_asset(Path(path): Path<String>) -> Response { async fn static_asset(Path(path): Path<String>) -> Response {
let (mime, data) = match path.as_str() { let Some(asset) = assets::STORE.get(&path) else {
"style.css" => ("text/css", STYLE_CSS), return StatusCode::NOT_FOUND.into_response();
"passkey-login.js" => ("application/javascript", PASSKEY_LOGIN_JS),
"passkey-register.js" => ("application/javascript", PASSKEY_REGISTER_JS),
"password-toggle.js" => ("application/javascript", PASSWORD_TOGGLE_JS),
_ => return StatusCode::NOT_FOUND.into_response(),
}; };
([(header::CONTENT_TYPE, mime)], data).into_response() let mime = match path.as_str() {
"style.css" => "text/css",
_ => "application/javascript",
};
let mut response = ([(header::CONTENT_TYPE, mime)], asset.data).into_response();
response.headers_mut().insert(
header::CACHE_CONTROL,
HeaderValue::from_static("public, max-age=31536000, immutable"),
);
response
} }
async fn log_response_status(request: Request, next: Next) -> Response { async fn log_response_status(request: Request, next: Next) -> Response {
@@ -594,15 +606,28 @@ async fn lists_page(
user: CurrentUser, user: CurrentUser,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
let lists = state.lists.list_summaries().await?; let lists = state.lists.list_summaries().await?;
let archived = state.lists.list_archived_summaries().await?;
let categories = state.lists.categories().await?; let categories = state.lists.categories().await?;
Ok(html_response(views::lists_page( Ok(html_response(views::lists_page(
&user.session.user, &user.session.user,
&lists, &lists,
archived.len(),
&categories, &categories,
&user.session.csrf_token, &user.session.csrf_token,
))) )))
} }
async fn archive_page(
State(state): State<AppState>,
user: CurrentUser,
) -> Result<Response, AppError> {
let archived_lists = state.lists.list_archived_summaries().await?;
Ok(html_response(views::archive_page(
&user.session.user,
&archived_lists,
)))
}
async fn create_list( async fn create_list(
State(state): State<AppState>, State(state): State<AppState>,
user: CurrentUser, user: CurrentUser,
@@ -640,6 +665,30 @@ async fn list_page(
))) )))
} }
async fn archive_list(
State(state): State<AppState>,
user: CurrentUser,
Path(list_id): Path<i64>,
LoggedForm(form): LoggedForm<CsrfForm>,
) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?;
state.lists.archive_list(list_id).await?;
Ok(Redirect::to("/lists").into_response())
}
async fn unarchive_list(
State(state): State<AppState>,
user: CurrentUser,
Path(list_id): Path<i64>,
LoggedForm(form): LoggedForm<CsrfForm>,
) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?;
state.lists.unarchive_list(list_id).await?;
Ok(Redirect::to("/lists").into_response())
}
async fn add_item( async fn add_item(
State(state): State<AppState>, State(state): State<AppState>,
user: CurrentUser, user: CurrentUser,
@@ -647,7 +696,7 @@ async fn add_item(
LoggedForm(form): LoggedForm<ItemForm>, LoggedForm(form): LoggedForm<ItemForm>,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?; verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?; require_mutable_list(&state, list_id).await?;
let name = form.name.trim().to_owned(); let name = form.name.trim().to_owned();
let quantity = form.quantity.trim().to_owned(); let quantity = form.quantity.trim().to_owned();
let note = form.note.trim().to_owned(); let note = form.note.trim().to_owned();
@@ -671,7 +720,7 @@ async fn check_item(
LoggedForm(form): LoggedForm<CheckForm>, LoggedForm(form): LoggedForm<CheckForm>,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?; verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?; require_mutable_list(&state, list_id).await?;
let checked = match form.checked.as_str() { let checked = match form.checked.as_str() {
"1" | "true" => true, "1" | "true" => true,
"0" | "false" => false, "0" | "false" => false,
@@ -691,7 +740,7 @@ async fn edit_item(
LoggedForm(form): LoggedForm<ItemForm>, LoggedForm(form): LoggedForm<ItemForm>,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?; verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?; require_mutable_list(&state, list_id).await?;
let name = form.name.trim().to_owned(); let name = form.name.trim().to_owned();
if name.is_empty() || name.chars().count() > 120 { if name.is_empty() || name.chars().count() > 120 {
return Err(AppError::BadRequest( return Err(AppError::BadRequest(
@@ -719,7 +768,7 @@ async fn delete_item(
LoggedForm(form): LoggedForm<CsrfForm>, LoggedForm(form): LoggedForm<CsrfForm>,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?; verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?; require_mutable_list(&state, list_id).await?;
state.lists.delete_item(list_id, item_id).await?; state.lists.delete_item(list_id, item_id).await?;
list_fragment_response(&state, &user, list_id).await list_fragment_response(&state, &user, list_id).await
} }
@@ -957,7 +1006,7 @@ async fn add_meal_to_list(
LoggedForm(form): LoggedForm<AddMealForm>, LoggedForm(form): LoggedForm<AddMealForm>,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?; verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?; require_mutable_list(&state, list_id).await?;
state.meals.add_meal_to_list(form.meal_id, list_id).await?; state.meals.add_meal_to_list(form.meal_id, list_id).await?;
list_fragment_response(&state, &user, list_id).await list_fragment_response(&state, &user, list_id).await
} }
@@ -969,7 +1018,7 @@ async fn remove_meal_from_list(
LoggedForm(form): LoggedForm<CsrfForm>, LoggedForm(form): LoggedForm<CsrfForm>,
) -> Result<Response, AppError> { ) -> Result<Response, AppError> {
verify_csrf(&user, &form.csrf)?; verify_csrf(&user, &form.csrf)?;
require_list(&state, list_id).await?; require_mutable_list(&state, list_id).await?;
state state
.meals .meals
.remove_meal_from_list(list_id, list_meal_id) .remove_meal_from_list(list_id, list_meal_id)
@@ -1181,6 +1230,7 @@ async fn list_fragment_response(
let items = state.lists.items(list_id).await?; let items = state.lists.items(list_id).await?;
let categories = state.lists.categories().await?; let categories = state.lists.categories().await?;
let list_meals = state.meals.list_meals_on_list(list_id).await?; let list_meals = state.meals.list_meals_on_list(list_id).await?;
let editable = access.archived_at.is_none();
Ok(html_response(PreEscaped( Ok(html_response(PreEscaped(
views::list_items_fragment( views::list_items_fragment(
&access, &access,
@@ -1188,10 +1238,17 @@ async fn list_fragment_response(
&categories, &categories,
&user.session.csrf_token, &user.session.csrf_token,
false, false,
editable,
) )
.into_string() .into_string()
+ &views::list_meals_panel(&list_meals, list_id, &user.session.csrf_token, true) + &views::list_meals_panel(
.into_string(), &list_meals,
list_id,
&user.session.csrf_token,
true,
editable,
)
.into_string(),
))) )))
} }
@@ -1206,6 +1263,19 @@ async fn require_list(
.ok_or(AppError::NotFound) .ok_or(AppError::NotFound)
} }
/// Like [`require_list`], but also rejects archived lists so they stay
/// immutable until restored.
async fn require_mutable_list(
state: &AppState,
list_id: i64,
) -> Result<crate::domain::GroceryList, AppError> {
let list = require_list(state, list_id).await?;
if list.archived_at.is_some() {
return Err(AppError::Archived);
}
Ok(list)
}
async fn optional_user( async fn optional_user(
state: &AppState, state: &AppState,
headers: &HeaderMap, headers: &HeaderMap,
+13 -1
View File
@@ -1,3 +1,4 @@
mod assets;
mod domain; mod domain;
mod http; mod http;
mod hub; mod hub;
@@ -42,6 +43,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.init(); .init();
let database_path = env::var("DATABASE_PATH").unwrap_or_else(|_| "sustenance.db".into()); let database_path = env::var("DATABASE_PATH").unwrap_or_else(|_| "sustenance.db".into());
let database_in_memory = env::var("DATABASE_IN_MEMORY")
.map(|value| value == "1" || value.eq_ignore_ascii_case("true"))
.unwrap_or(false);
let bind_address = env::var("BIND_ADDRESS").unwrap_or_else(|_| "127.0.0.1:3000".into()); let bind_address = env::var("BIND_ADDRESS").unwrap_or_else(|_| "127.0.0.1:3000".into());
// For loopback hosts, advertise `localhost` so WebAuthn works locally (browsers // For loopback hosts, advertise `localhost` so WebAuthn works locally (browsers
// reject IP addresses as RP IDs). Access the app via http://localhost:PORT. // reject IP addresses as RP IDs). Access the app via http://localhost:PORT.
@@ -69,7 +73,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
}; };
// Build the adapters (ports) and wire them into application services. // Build the adapters (ports) and wire them into application services.
let db = SqliteDatabase::open(&database_path).await?; let db = if database_in_memory {
SqliteDatabase::open_in_memory().await?
} else {
SqliteDatabase::open(&database_path).await?
};
let users: Arc<dyn UserRepository> = Arc::new(SqliteUserRepository); let users: Arc<dyn UserRepository> = Arc::new(SqliteUserRepository);
let sessions: Arc<dyn SessionRepository> = Arc::new(SqliteSessionRepository); let sessions: Arc<dyn SessionRepository> = Arc::new(SqliteSessionRepository);
let lists: Arc<dyn ListRepository> = Arc::new(SqliteListRepository); let lists: Arc<dyn ListRepository> = Arc::new(SqliteListRepository);
@@ -163,6 +171,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.with_graceful_shutdown(shutdown_signal()) .with_graceful_shutdown(shutdown_signal())
.await?; .await?;
info!("shutdown complete; closing database"); info!("shutdown complete; closing database");
// Explicitly close the pool so SQLite can checkpoint and remove the
// WAL/SHM sidecar files. Without this, the pool's background close task
// races with process exit and the sidecars can be left behind.
db.close().await;
Ok(()) Ok(())
} }
+10
View File
@@ -88,6 +88,10 @@ pub trait SessionRepository: Send + Sync {
#[async_trait] #[async_trait]
pub trait ListRepository: Send + Sync { pub trait ListRepository: Send + Sync {
async fn list_summaries(&self, txn: &mut SqliteConnection) -> DomainResult<Vec<GroceryList>>; async fn list_summaries(&self, txn: &mut SqliteConnection) -> DomainResult<Vec<GroceryList>>;
async fn list_archived_summaries(
&self,
txn: &mut SqliteConnection,
) -> DomainResult<Vec<GroceryList>>;
async fn create_list( async fn create_list(
&self, &self,
txn: &mut SqliteConnection, txn: &mut SqliteConnection,
@@ -98,6 +102,12 @@ pub trait ListRepository: Send + Sync {
txn: &mut SqliteConnection, txn: &mut SqliteConnection,
list_id: i64, list_id: i64,
) -> DomainResult<Option<GroceryList>>; ) -> DomainResult<Option<GroceryList>>;
async fn set_archived(
&self,
txn: &mut SqliteConnection,
list_id: i64,
archived: bool,
) -> DomainResult<()>;
} }
#[async_trait] #[async_trait]
+21
View File
@@ -199,6 +199,13 @@ impl ListService {
.await .await
} }
pub async fn list_archived_summaries(&self) -> DomainResult<Vec<GroceryList>> {
let lists = Arc::clone(&self.lists);
self.db
.run(move |txn| Box::pin(async move { lists.list_archived_summaries(txn).await }))
.await
}
pub async fn create_list(&self, name: String) -> DomainResult<GroceryList> { pub async fn create_list(&self, name: String) -> DomainResult<GroceryList> {
let lists = Arc::clone(&self.lists); let lists = Arc::clone(&self.lists);
self.db self.db
@@ -213,6 +220,20 @@ impl ListService {
.await .await
} }
pub async fn archive_list(&self, list_id: i64) -> DomainResult<()> {
let lists = Arc::clone(&self.lists);
self.db
.run(move |txn| Box::pin(async move { lists.set_archived(txn, list_id, true).await }))
.await
}
pub async fn unarchive_list(&self, list_id: i64) -> DomainResult<()> {
let lists = Arc::clone(&self.lists);
self.db
.run(move |txn| Box::pin(async move { lists.set_archived(txn, list_id, false).await }))
.await
}
pub async fn items(&self, list_id: i64) -> DomainResult<Vec<Item>> { pub async fn items(&self, list_id: i64) -> DomainResult<Vec<Item>> {
let items = Arc::clone(&self.items); let items = Arc::clone(&self.items);
self.db self.db
+167 -16
View File
@@ -39,26 +39,32 @@ impl SqliteDatabase {
Ok(Self { pool }) Ok(Self { pool })
} }
#[cfg(test)] /// Opens an in-memory database. Every connection in the pool shares the same
/// in-memory database via a named shared-cache database, so the schema and
/// data are visible across the whole pool. Nothing is persisted to disk.
pub async fn open_in_memory() -> DomainResult<Self> { pub async fn open_in_memory() -> DomainResult<Self> {
// A pool of `:memory:` connections would each get a separate database, // A plain `:memory:` database is private to each connection, so a pool
// so use a unique temporary file that shares the schema across the pool. // would get a separate database per connection. Use a uniquely-named
// shared-cache in-memory database instead so the whole pool shares one.
//
// The name must be unique per call: shared-cache in-memory databases are
// keyed by name, so two calls with the same name within a process would
// resolve to the same database and share state. This matters for the
// unit tests, which run many `open_in_memory()` calls in parallel within
// a single process and need isolation from each other. The counter makes
// each call unique. (Shared-cache and in-memory databases are per-process,
// so there is no cross-process collision to guard against.)
use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::atomic::{AtomicU64, Ordering};
static COUNTER: AtomicU64 = AtomicU64::new(0); static COUNTER: AtomicU64 = AtomicU64::new(0);
let unique = COUNTER.fetch_add(1, Ordering::Relaxed); let unique = COUNTER.fetch_add(1, Ordering::Relaxed);
let path = std::env::temp_dir().join(format!( let filename = format!("file:sustenance-in-memory-{}", unique);
"sustenance-test-{}-{}-{}.db",
std::process::id(),
now(),
unique
));
let path = path.to_str().unwrap();
let options = SqliteConnectOptions::new() let options = SqliteConnectOptions::new()
.filename(path) .filename(filename)
.journal_mode(sqlx::sqlite::SqliteJournalMode::Wal) .in_memory(true)
.shared_cache(true)
.journal_mode(sqlx::sqlite::SqliteJournalMode::Memory)
.foreign_keys(true) .foreign_keys(true)
.busy_timeout(std::time::Duration::from_secs(5)) .busy_timeout(std::time::Duration::from_secs(5));
.create_if_missing(true);
let pool = SqlitePool::connect_with(options).await.map_err(db_error)?; let pool = SqlitePool::connect_with(options).await.map_err(db_error)?;
MIGRATOR.run(&pool).await.map_err(migrate_error)?; MIGRATOR.run(&pool).await.map_err(migrate_error)?;
seed_default_categories(&pool).await?; seed_default_categories(&pool).await?;
@@ -68,6 +74,14 @@ impl SqliteDatabase {
} }
impl SqliteDatabase { impl SqliteDatabase {
/// Closes the connection pool, waiting for all connections to be released
/// and closed. This lets SQLite checkpoint and remove the WAL/SHM sidecar
/// files on a clean shutdown; without it, the pool's background close task
/// races with process exit and the sidecars may be left behind.
pub async fn close(&self) {
self.pool.close().await;
}
/// Runs `operation` inside a single transaction, committing on success and /// Runs `operation` inside a single transaction, committing on success and
/// rolling back on error. Multiple repositories can participate in the same /// rolling back on error. Multiple repositories can participate in the same
/// transaction so their writes commit together atomically. /// transaction so their writes commit together atomically.
@@ -442,8 +456,9 @@ pub struct SqliteListRepository;
impl ListRepository for SqliteListRepository { impl ListRepository for SqliteListRepository {
async fn list_summaries(&self, txn: &mut SqliteConnection) -> DomainResult<Vec<GroceryList>> { async fn list_summaries(&self, txn: &mut SqliteConnection) -> DomainResult<Vec<GroceryList>> {
let rows = sqlx::query( let rows = sqlx::query(
"SELECT l.id, l.name, l.revision "SELECT l.id, l.name, l.revision, l.created_at, l.archived_at
FROM lists l FROM lists l
WHERE l.archived_at IS NULL
ORDER BY l.created_at DESC", ORDER BY l.created_at DESC",
) )
.fetch_all(&mut *txn) .fetch_all(&mut *txn)
@@ -455,6 +470,33 @@ impl ListRepository for SqliteListRepository {
id: row.get(0), id: row.get(0),
name: row.get(1), name: row.get(1),
revision: row.get(2), revision: row.get(2),
created_at: row.get(3),
archived_at: row.get(4),
})
.collect())
}
async fn list_archived_summaries(
&self,
txn: &mut SqliteConnection,
) -> DomainResult<Vec<GroceryList>> {
let rows = sqlx::query(
"SELECT l.id, l.name, l.revision, l.created_at, l.archived_at
FROM lists l
WHERE l.archived_at IS NOT NULL
ORDER BY l.archived_at DESC, l.created_at DESC",
)
.fetch_all(&mut *txn)
.await
.map_err(db_error)?;
Ok(rows
.into_iter()
.map(|row| GroceryList {
id: row.get(0),
name: row.get(1),
revision: row.get(2),
created_at: row.get(3),
archived_at: row.get(4),
}) })
.collect()) .collect())
} }
@@ -479,6 +521,8 @@ impl ListRepository for SqliteListRepository {
id: list_id, id: list_id,
name, name,
revision: 0, revision: 0,
created_at: now(),
archived_at: None,
}) })
} }
@@ -488,7 +532,7 @@ impl ListRepository for SqliteListRepository {
list_id: i64, list_id: i64,
) -> DomainResult<Option<GroceryList>> { ) -> DomainResult<Option<GroceryList>> {
let row = sqlx::query( let row = sqlx::query(
"SELECT l.id, l.name, l.revision "SELECT l.id, l.name, l.revision, l.created_at, l.archived_at
FROM lists l FROM lists l
WHERE l.id = ?1", WHERE l.id = ?1",
) )
@@ -500,8 +544,36 @@ impl ListRepository for SqliteListRepository {
id: row.get(0), id: row.get(0),
name: row.get(1), name: row.get(1),
revision: row.get(2), revision: row.get(2),
created_at: row.get(3),
archived_at: row.get(4),
})) }))
} }
async fn set_archived(
&self,
txn: &mut SqliteConnection,
list_id: i64,
archived: bool,
) -> DomainResult<()> {
let result = if archived {
sqlx::query("UPDATE lists SET archived_at = ?1 WHERE id = ?2")
.bind(now())
.bind(list_id)
.execute(&mut *txn)
.await
.map_err(db_error)?
} else {
sqlx::query("UPDATE lists SET archived_at = NULL WHERE id = ?1")
.bind(list_id)
.execute(&mut *txn)
.await
.map_err(db_error)?
};
if result.rows_affected() == 0 {
return Err(DomainError::NotFound);
}
Ok(())
}
} }
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
@@ -1608,6 +1680,85 @@ mod tests {
assert_eq!(ids, vec![first.id, second.id]); assert_eq!(ids, vec![first.id, second.id]);
} }
#[tokio::test]
async fn archiving_a_list_hides_it_from_summaries() {
let db = setup().await;
let list = create_list(&db, "Weekly shop").await;
let lists = SqliteListRepository;
let list_id = list.id;
db.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.set_archived(txn, list_id, true).await })
})
.await
.unwrap();
let summaries = db
.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.list_summaries(txn).await })
})
.await
.unwrap();
assert!(summaries.is_empty());
let archived = db
.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.list_archived_summaries(txn).await })
})
.await
.unwrap();
assert_eq!(archived.len(), 1);
assert_eq!(archived[0].id, list.id);
assert!(archived[0].archived_at.is_some());
}
#[tokio::test]
async fn unarchiving_a_list_restores_it_to_summaries() {
let db = setup().await;
let list = create_list(&db, "Weekly shop").await;
let lists = SqliteListRepository;
let list_id = list.id;
db.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.set_archived(txn, list_id, true).await })
})
.await
.unwrap();
db.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.set_archived(txn, list_id, false).await })
})
.await
.unwrap();
let summaries = db
.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.list_summaries(txn).await })
})
.await
.unwrap();
assert_eq!(summaries.len(), 1);
assert!(summaries[0].archived_at.is_none());
}
#[tokio::test]
async fn archiving_a_missing_list_fails() {
let db = setup().await;
let lists = SqliteListRepository;
let result = db
.run(move |txn| {
let lists = lists.clone();
Box::pin(async move { lists.set_archived(txn, 9999, true).await })
})
.await;
assert!(result.is_err());
}
#[tokio::test] #[tokio::test]
async fn get_list_returns_list_or_none() { async fn get_list_returns_list_or_none() {
let db = setup().await; let db = setup().await;
+228 -96
View File
@@ -37,8 +37,8 @@ pub fn login_page(error: Option<&str>, invite: Option<&str>) -> Markup {
button id="passkey-login" class="button button-secondary" type="button" { "Sign in with a passkey" } button id="passkey-login" class="button button-secondary" type="button" { "Sign in with a passkey" }
p class="auth-switch" { "Need an account? " a href="/register" { "Create one" } } p class="auth-switch" { "Need an account? " a href="/register" { "Create one" } }
} }
script src="/static/password-toggle.js" {} script src=(crate::assets::url("password-toggle.js")) {}
script src="/static/passkey-login.js" {} script src=(crate::assets::url("passkey-login.js")) {}
}, },
) )
} }
@@ -72,7 +72,7 @@ pub fn register_page(error: Option<&str>, invite: Option<&str>) -> Markup {
} }
p class="auth-switch" { "Already have an account? " a href="/login" { "Sign in" } } p class="auth-switch" { "Already have an account? " a href="/login" { "Sign in" } }
} }
script src="/static/password-toggle.js" {} script src=(crate::assets::url("password-toggle.js")) {}
}, },
) )
} }
@@ -164,8 +164,8 @@ pub fn account_page(
} }
} }
} }
script src="/static/password-toggle.js" {} script src=(crate::assets::url("password-toggle.js")) {}
script src="/static/passkey-register.js" {} script src=(crate::assets::url("passkey-register.js")) {}
}, },
) )
} }
@@ -173,6 +173,7 @@ pub fn account_page(
pub fn lists_page( pub fn lists_page(
user: &User, user: &User,
lists: &[GroceryList], lists: &[GroceryList],
archived_count: usize,
categories: &[Category], categories: &[Category],
csrf_token: &str, csrf_token: &str,
) -> Markup { ) -> Markup {
@@ -192,6 +193,7 @@ pub fn lists_page(
div class="panel-heading" { div class="panel-heading" {
h2 { "Lists" } h2 { "Lists" }
span class="count-badge" { (lists.len()) } span class="count-badge" { (lists.len()) }
a class="archive-link" href="/archive" { "Archived " span class="count-badge" { (archived_count) } "" }
} }
@if lists.is_empty() { @if lists.is_empty() {
div class="empty-state" { div class="empty-state" {
@@ -242,6 +244,49 @@ pub fn lists_page(
) )
} }
pub fn archive_page(user: &User, archived_lists: &[GroceryList]) -> Markup {
page(
"Archive",
Some(user),
html! {
div class="page-heading" {
div {
p class="eyebrow" { "ARCHIVE" }
h1 class="page-title" { "Archived lists" }
p class="lede" { "Past lists, kept for reference." }
}
a class="button button-quiet" href="/lists" { "← Back to lists" }
}
section class="panel" {
div class="panel-heading" {
h2 { "Archive" }
span class="count-badge" { (archived_lists.len()) }
}
@if archived_lists.is_empty() {
div class="empty-state" {
div class="empty-mark" { "🗄" }
h3 { "Nothing archived yet" }
p { "Archive a list and it will show up here." }
}
} @else {
div class="list-cards" {
@for list in archived_lists {
a class="list-card archived-list-card" href=(format!("/lists/{}", list.id)) {
span class="list-card-icon" { "🗄" }
span class="list-card-copy" {
strong { (list.name) }
small { "Created " (format_date(list.created_at)) }
}
span class="list-card-arrow" { "" }
}
}
}
}
}
},
)
}
pub fn meals_page( pub fn meals_page(
user: &User, user: &User,
meals: &[Meal], meals: &[Meal],
@@ -499,13 +544,6 @@ pub fn meal_page(
html! { html! {
div class="page-heading" { div class="page-heading" {
a class="back-link" href="/meals" { "← All meals" } a class="back-link" href="/meals" { "← All meals" }
div class="list-topbar-actions" {
button type="button" class="button button-small button-quiet" onclick="document.getElementById('meal-edit-modal').showModal()" { "Edit" }
form method="post" action=(format!("/meals/{}/delete", meal.id)) {
input type="hidden" name="csrf" value=(csrf_token);
button class="danger-link" type="submit" { "Delete" }
}
}
} }
dialog id="meal-edit-modal" class="item-modal" { dialog id="meal-edit-modal" class="item-modal" {
div class="item-modal-card" { div class="item-modal-card" {
@@ -545,6 +583,13 @@ pub fn meal_page(
p class="eyebrow" { "MEAL" } p class="eyebrow" { "MEAL" }
h1 { (meal.name) @if let Some(category_name) = meal_category_name(meal, meal_categories) { span class="meal-category-label" { "(" (category_name) ")" } } } h1 { (meal.name) @if let Some(category_name) = meal_category_name(meal, meal_categories) { span class="meal-category-label" { "(" (category_name) ")" } } }
} }
div class="list-topbar-actions" {
button type="button" class="button button-small button-quiet" onclick="document.getElementById('meal-edit-modal').showModal()" { "Edit" }
form method="post" action=(format!("/meals/{}/delete", meal.id)) onsubmit="return confirm('Delete this meal and its ingredients? This cannot be undone.')" {
input type="hidden" name="csrf" value=(csrf_token);
button class="danger-link bordered-delete" type="submit" { "Delete" }
}
}
} }
@if meal.description.is_empty() { @if meal.description.is_empty() {
p class="muted" { "No description." } p class="muted" { "No description." }
@@ -712,6 +757,13 @@ mod tests {
assert!(html.contains("<strong>"), "expected <strong>, got: {html}"); assert!(html.contains("<strong>"), "expected <strong>, got: {html}");
assert!(html.contains("<em>"), "expected <em>, got: {html}"); assert!(html.contains("<em>"), "expected <em>, got: {html}");
} }
#[test]
fn format_date_renders_human_readable_date() {
// 2026-08-07T00:00:00Z in Unix seconds.
let ts = 1_786_060_800;
assert_eq!(format_date(ts), "7 Aug 2026");
}
} }
pub fn list_page( pub fn list_page(
@@ -733,6 +785,9 @@ pub fn list_page(
span class="live-pill" { span class="live-dot" {} "Live" } span class="live-pill" { span class="live-dot" {} "Live" }
} }
} }
@if let Some(ts) = list.archived_at {
div class="archived-banner" { "This list was archived on " (format_date(ts)) "." }
}
div id="meal-picker" class="meal-picker" {} div id="meal-picker" class="meal-picker" {}
div class="list-layout" { div class="list-layout" {
section class="panel list-panel" { section class="panel list-panel" {
@@ -740,13 +795,26 @@ pub fn list_page(
div { div {
p class="eyebrow" { "SHARED LIST" } p class="eyebrow" { "SHARED LIST" }
h1 { (list.name) } h1 { (list.name) }
p class="list-meta" { (items.iter().filter(|item| !item.checked).count()) " items to get" } (list_meta_fragment(items, false))
}
div class="list-topbar-actions" {
@if list.archived_at.is_some() {
form method="post" action=(format!("/lists/{}/unarchive", list.id)) {
input type="hidden" name="csrf" value=(csrf_token);
button class="button button-small button-quiet" type="submit" { "Restore" }
}
} @else {
form method="post" action=(format!("/lists/{}/archive", list.id)) {
input type="hidden" name="csrf" value=(csrf_token);
button class="button button-small button-quiet" type="submit" { "Archive" }
}
}
} }
} }
(list_content_fragment(list, items, categories, csrf_token, false)) (list_content_fragment(list, items, categories, csrf_token, false, list.archived_at.is_none()))
} }
aside class="side-column" { aside class="side-column" {
(list_meals_panel(list_meals, list.id, csrf_token, false)) (list_meals_panel(list_meals, list.id, csrf_token, false, list.archived_at.is_none()))
(presence_panel(presence, false)) (presence_panel(presence, false))
section class="panel tip-panel" { section class="panel tip-panel" {
span class="tip-label" { "TIP" } span class="tip-label" { "TIP" }
@@ -765,17 +833,18 @@ pub fn list_content_fragment(
categories: &[Category], categories: &[Category],
csrf_token: &str, csrf_token: &str,
out_of_band: bool, out_of_band: bool,
editable: bool,
) -> Markup { ) -> Markup {
if out_of_band { if out_of_band {
html! { html! {
div id="list-content" hx-swap-oob="outerHTML" { div id="list-content" hx-swap-oob="outerHTML" {
(list_content(list, items, categories, csrf_token)) (list_content(list, items, categories, csrf_token, editable))
} }
} }
} else { } else {
html! { html! {
div id="list-content" { div id="list-content" {
(list_content(list, items, categories, csrf_token)) (list_content(list, items, categories, csrf_token, editable))
} }
} }
} }
@@ -786,26 +855,29 @@ fn list_content(
items: &[Item], items: &[Item],
categories: &[Category], categories: &[Category],
csrf_token: &str, csrf_token: &str,
editable: bool,
) -> Markup { ) -> Markup {
html! { html! {
form @if editable {
id="add-item-form" form
class="add-item-form" id="add-item-form"
hx-post=(format!("/lists/{}/items", list.id)) class="add-item-form"
hx-target="#list-items" hx-post=(format!("/lists/{}/items", list.id))
hx-swap="outerHTML" hx-target="#list-items"
hx-on::after-request="if (event.detail.successful) this.reset()" hx-swap="outerHTML"
{ hx-on::after-request="if (event.detail.successful) this.reset()"
input type="hidden" name="csrf" value=(csrf_token); {
label class="sr-only" for="item-name" { "Item name" } input type="hidden" name="csrf" value=(csrf_token);
input id="item-name" name="name" type="text" maxlength="120" placeholder="Add an item..." autocomplete="off" required; label class="sr-only" for="item-name" { "Item name" }
select id="item-category" name="category_id" aria-label="Category" { input id="item-name" name="name" type="text" maxlength="120" placeholder="Add an item..." autocomplete="off" required;
(category_options(categories, None)) select id="item-category" name="category_id" aria-label="Category" {
(category_options(categories, None))
}
input id="item-quantity" name="quantity" type="text" maxlength="40" placeholder="Qty" aria-label="Quantity";
button id="add-item-button" class="button button-primary add-button" type="submit" { "+ Add" }
} }
input id="item-quantity" name="quantity" type="text" maxlength="40" placeholder="Qty" aria-label="Quantity";
button id="add-item-button" class="button button-primary add-button" type="submit" { "+ Add" }
} }
(list_items_fragment(list, items, categories, csrf_token, false)) (list_items_fragment(list, items, categories, csrf_token, false, editable))
} }
} }
@@ -815,23 +887,29 @@ pub fn list_items_fragment(
categories: &[Category], categories: &[Category],
csrf_token: &str, csrf_token: &str,
out_of_band: bool, out_of_band: bool,
editable: bool,
) -> Markup { ) -> Markup {
if out_of_band { if out_of_band {
html! { html! {
div id="list-items" class="items" data-revision=(list.revision) hx-swap-oob="outerHTML" { div id="list-items" class="items" data-revision=(list.revision) hx-swap-oob="outerHTML" {
(list_items_content(items, categories, csrf_token)) (list_items_content(items, categories, csrf_token, editable))
} }
} }
} else { } else {
html! { html! {
div id="list-items" class="items" data-revision=(list.revision) { div id="list-items" class="items" data-revision=(list.revision) {
(list_items_content(items, categories, csrf_token)) (list_items_content(items, categories, csrf_token, editable))
} }
} }
} }
} }
fn list_items_content(items: &[Item], categories: &[Category], csrf_token: &str) -> Markup { fn list_items_content(
items: &[Item],
categories: &[Category],
csrf_token: &str,
editable: bool,
) -> Markup {
html! { html! {
@if items.is_empty() { @if items.is_empty() {
div class="empty-items" { div class="empty-items" {
@@ -842,7 +920,7 @@ fn list_items_content(items: &[Item], categories: &[Category], csrf_token: &str)
} @else { } @else {
div class="item-list" { div class="item-list" {
@for group in item_groups(items, categories) { @for group in item_groups(items, categories) {
(category_group(&group.0, &group.1, categories, csrf_token)) (category_group(&group.0, &group.1, categories, csrf_token, editable))
} }
} }
} }
@@ -876,32 +954,37 @@ fn category_group(
items: &[&Item], items: &[&Item],
categories: &[Category], categories: &[Category],
csrf_token: &str, csrf_token: &str,
editable: bool,
) -> Markup { ) -> Markup {
html! { html! {
section class="category-group" { section class="category-group" {
h2 class="category-heading" { (name) } h2 class="category-heading" { (name) }
@for item in items { @for item in items {
(item_row(item, categories, csrf_token)) (item_row(item, categories, csrf_token, editable))
} }
} }
} }
} }
fn item_row(item: &Item, categories: &[Category], csrf_token: &str) -> Markup { fn item_row(item: &Item, categories: &[Category], csrf_token: &str, editable: bool) -> Markup {
let next_checked = if item.checked { "0" } else { "1" }; let next_checked = if item.checked { "0" } else { "1" };
html! { html! {
article class=(if item.checked { "item-row is-checked" } else { "item-row" }) id=(format!("item-{}", item.id)) data-version=(item.version) { article class=(if item.checked { "item-row is-checked" } else { "item-row" }) id=(format!("item-{}", item.id)) data-version=(item.version) {
form @if editable {
class="check-form" form
hx-post=(format!("/lists/{}/items/{}/check", item.list_id, item.id)) class="check-form"
hx-target="#list-items" hx-post=(format!("/lists/{}/items/{}/check", item.list_id, item.id))
hx-swap="outerHTML" hx-target="#list-items"
{ hx-swap="outerHTML"
input type="hidden" name="csrf" value=(csrf_token); {
input type="hidden" name="checked" value=(next_checked); input type="hidden" name="csrf" value=(csrf_token);
button id=(format!("item-check-{}", item.id)) class="check-button" type="submit" aria-label=(if item.checked { "Mark unchecked" } else { "Mark complete" }) { input type="hidden" name="checked" value=(next_checked);
@if item.checked { "" } @else { "" } button id=(format!("item-check-{}", item.id)) class="check-button" type="submit" aria-label=(if item.checked { "Mark unchecked" } else { "Mark complete" }) {
@if item.checked { "" } @else { "" }
}
} }
} @else if item.checked {
span class="check-button check-button-static" { "" }
} }
label class="item-copy" for=(format!("item-check-{}", item.id)) { label class="item-copy" for=(format!("item-check-{}", item.id)) {
@if !item.quantity.is_empty() { @if !item.quantity.is_empty() {
@@ -912,39 +995,41 @@ fn item_row(item: &Item, categories: &[Category], csrf_token: &str) -> Markup {
small { (item.note) } small { (item.note) }
} }
} }
button type="button" class="item-actions-button" aria-label="Item actions" onclick=(format!("document.getElementById('item-edit-{}').showModal()", item.id)) { "•••" } @if editable {
dialog id=(format!("item-edit-{}", item.id)) class="item-modal" { button type="button" class="item-actions-button" aria-label="Item actions" onclick=(format!("document.getElementById('item-edit-{}').showModal()", item.id)) { "•••" }
div class="item-modal-card" { dialog id=(format!("item-edit-{}", item.id)) class="item-modal" {
div class="item-modal-header" { div class="item-modal-card" {
h3 { (item.name) } div class="item-modal-header" {
button type="button" class="meal-picker-close" aria-label="Close" onclick="this.closest('dialog').close()" { "" } h3 { (item.name) }
} button type="button" class="meal-picker-close" aria-label="Close" onclick="this.closest('dialog').close()" { "" }
form }
hx-post=(format!("/lists/{}/items/{}/edit", item.list_id, item.id)) form
hx-target="#list-items" hx-post=(format!("/lists/{}/items/{}/edit", item.list_id, item.id))
hx-swap="outerHTML" hx-target="#list-items"
class="stack" hx-swap="outerHTML"
{ class="stack"
input type="hidden" name="csrf" value=(csrf_token); {
label { "Name" } input type="hidden" name="csrf" value=(csrf_token);
input id=(format!("item-edit-name-{}", item.id)) name="name" value=(item.name) maxlength="120" required; label { "Name" }
label { "Category" } input id=(format!("item-edit-name-{}", item.id)) name="name" value=(item.name) maxlength="120" required;
select id=(format!("item-edit-category-{}", item.id)) name="category_id" { label { "Category" }
(category_options(categories, item.category_id)) select id=(format!("item-edit-category-{}", item.id)) name="category_id" {
(category_options(categories, item.category_id))
}
label { "Quantity" }
input id=(format!("item-edit-quantity-{}", item.id)) name="quantity" value=(item.quantity) maxlength="40";
label { "Note" }
input id=(format!("item-edit-note-{}", item.id)) name="note" value=(item.note) maxlength="120";
button id=(format!("item-edit-save-{}", item.id)) class="button button-primary" type="submit" { "Save" }
}
form
hx-post=(format!("/lists/{}/items/{}/delete", item.list_id, item.id))
hx-target="#list-items"
hx-swap="outerHTML"
{
input type="hidden" name="csrf" value=(csrf_token);
button id=(format!("item-edit-delete-{}", item.id)) class="button button-danger" type="submit" { "Remove item" }
} }
label { "Quantity" }
input id=(format!("item-edit-quantity-{}", item.id)) name="quantity" value=(item.quantity) maxlength="40";
label { "Note" }
input id=(format!("item-edit-note-{}", item.id)) name="note" value=(item.note) maxlength="120";
button id=(format!("item-edit-save-{}", item.id)) class="button button-primary" type="submit" { "Save" }
}
form
hx-post=(format!("/lists/{}/items/{}/delete", item.list_id, item.id))
hx-target="#list-items"
hx-swap="outerHTML"
{
input type="hidden" name="csrf" value=(csrf_token);
button id=(format!("item-edit-delete-{}", item.id)) class="button button-danger" type="submit" { "Remove item" }
} }
} }
} }
@@ -1010,6 +1095,21 @@ pub fn categories_panel(categories: &[Category], csrf_token: &str, out_of_band:
} }
} }
fn list_meta_fragment(items: &[Item], out_of_band: bool) -> Markup {
let left = items.iter().filter(|item| !item.checked).count();
let total = items.len();
let meta = html! {
p id="list-meta" class="list-meta" { (left) " items left out of " (total) }
};
if out_of_band {
html! {
p id="list-meta" class="list-meta" hx-swap-oob="outerHTML" { (left) " items left out of " (total) }
}
} else {
meta
}
}
pub fn live_list_fragments( pub fn live_list_fragments(
list: &GroceryList, list: &GroceryList,
items: &[Item], items: &[Item],
@@ -1017,9 +1117,11 @@ pub fn live_list_fragments(
list_meals: &[ListMeal], list_meals: &[ListMeal],
csrf_token: &str, csrf_token: &str,
) -> Markup { ) -> Markup {
let editable = list.archived_at.is_none();
html! { html! {
(list_content_fragment(list, items, categories, csrf_token, true)) (list_meta_fragment(items, true))
(list_meals_panel(list_meals, list.id, csrf_token, true)) (list_items_fragment(list, items, categories, csrf_token, true, editable))
(list_meals_panel(list_meals, list.id, csrf_token, true, editable))
} }
} }
@@ -1028,6 +1130,7 @@ pub fn list_meals_panel(
list_id: i64, list_id: i64,
csrf_token: &str, csrf_token: &str,
out_of_band: bool, out_of_band: bool,
editable: bool,
) -> Markup { ) -> Markup {
let panel = html! { let panel = html! {
div class="panel-heading" { div class="panel-heading" {
@@ -1042,20 +1145,24 @@ pub fn list_meals_panel(
div class="list-meal-row" { div class="list-meal-row" {
span class="list-meal-icon" { "🍽" } span class="list-meal-icon" { "🍽" }
span class="list-meal-name" { (meal.name) } span class="list-meal-name" { (meal.name) }
form @if editable {
hx-post=(format!("/lists/{}/meals/{}/remove", list_id, meal.id)) form
hx-target="#list-items" hx-post=(format!("/lists/{}/meals/{}/remove", list_id, meal.id))
hx-swap="outerHTML" hx-target="#list-items"
class="list-meal-remove" hx-swap="outerHTML"
{ class="list-meal-remove"
input type="hidden" name="csrf" value=(csrf_token); {
button type="submit" class="list-meal-remove-button" aria-label=(format!("Remove {} from list", meal.name)) { "" } input type="hidden" name="csrf" value=(csrf_token);
button type="submit" class="list-meal-remove-button" aria-label=(format!("Remove {} from list", meal.name)) { "" }
}
} }
} }
} }
} }
} }
button class="button button-small add-meal-button" hx-get=(format!("/meals?picker={}", list_id)) hx-target="#meal-picker" hx-swap="innerHTML" { "+ Add meal" } @if editable {
button class="button button-small add-meal-button" hx-get=(format!("/meals?picker={}", list_id)) hx-target="#meal-picker" hx-swap="innerHTML" { "+ Add meal" }
}
}; };
if out_of_band { if out_of_band {
@@ -1153,6 +1260,31 @@ pub fn invite_result(url: &str) -> Markup {
} }
} }
/// Formats a Unix timestamp as a human-readable date (e.g. "7 Aug 2026").
fn format_date(timestamp: i64) -> String {
let days = timestamp.div_euclid(86_400);
let (y, m, d) = civil_from_days(days);
const MONTHS: [&str; 12] = [
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
];
format!("{} {} {}", d, MONTHS[(m - 1) as usize], y)
}
/// Converts a count of days since the Unix epoch into a (year, month, day)
/// civil date using Howard Hinnant's `civil_from_days` algorithm.
fn civil_from_days(z: i64) -> (i64, i64, i64) {
let z = z + 719_468;
let era = z.div_euclid(146_097);
let doe = z.rem_euclid(146_097);
let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365;
let y = yoe + era * 400;
let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
let mp = (5 * doy + 2) / 153;
let d = doy - (153 * mp + 2) / 5 + 1;
let m = if mp < 10 { mp + 3 } else { mp - 9 };
(if m <= 2 { y + 1 } else { y }, m, d)
}
pub fn error_page(status: &str, message: &str) -> Markup { pub fn error_page(status: &str, message: &str) -> Markup {
page( page(
status, status,
@@ -1176,11 +1308,11 @@ fn page(title: &str, user: Option<&User>, content: Markup) -> Markup {
meta charset="utf-8"; meta charset="utf-8";
meta name="viewport" content="width=device-width, initial-scale=1"; meta name="viewport" content="width=device-width, initial-scale=1";
title { (title) " · Sustenance" } title { (title) " · Sustenance" }
link rel="stylesheet" href="/static/style.css"; link rel="stylesheet" href=(crate::assets::url("style.css"));
script src="https://unpkg.com/htmx.org@2.0.4" {} script src=(crate::assets::url("htmx.min.js")) {}
script src="https://unpkg.com/htmx-ext-ws@2.0.2/ws.js" {} script src=(crate::assets::url("htmx-ws.min.js")) {}
} }
body { body hx-boost="true" {
header class="site-header" { header class="site-header" {
a class="brand" href="/lists" { span class="brand-mark" { "S" } "Sustenance" } a class="brand" href="/lists" { span class="brand-mark" { "S" } "Sustenance" }
@if let Some(user) = user { @if let Some(user) = user {
+1
View File
File diff suppressed because one or more lines are too long
+1
View File
File diff suppressed because one or more lines are too long
+11
View File
@@ -71,6 +71,8 @@ h3 { margin-bottom: 6px; font-size: 1rem; }
.dashboard-grid { display: grid; grid-template-columns: minmax(0, 1.5fr) minmax(260px, .8fr); gap: 22px; align-items: start; } .dashboard-grid { display: grid; grid-template-columns: minmax(0, 1.5fr) minmax(260px, .8fr); gap: 22px; align-items: start; }
.panel { padding: 26px; border: 1px solid rgba(221, 225, 210, .9); border-radius: 24px; background: rgba(255, 253, 248, .88); box-shadow: var(--shadow); } .panel { padding: 26px; border: 1px solid rgba(221, 225, 210, .9); border-radius: 24px; background: rgba(255, 253, 248, .88); box-shadow: var(--shadow); }
.panel-heading { display: flex; justify-content: space-between; align-items: center; gap: 12px; margin-bottom: 22px; } .panel-heading { display: flex; justify-content: space-between; align-items: center; gap: 12px; margin-bottom: 22px; }
.archive-link { margin-left: auto; color: var(--muted); font-size: .78rem; font-weight: 700; text-decoration: none; }
.archive-link:hover { color: var(--deep-sage); }
.count-badge { display: inline-grid; place-items: center; min-width: 27px; height: 27px; padding: 0 8px; border-radius: 99px; color: var(--deep-sage); background: #e8f0e1; font-size: .78rem; font-weight: 800; } .count-badge { display: inline-grid; place-items: center; min-width: 27px; height: 27px; padding: 0 8px; border-radius: 99px; color: var(--deep-sage); background: #e8f0e1; font-size: .78rem; font-weight: 800; }
.stack { display: grid; gap: 9px; } .stack { display: grid; gap: 9px; }
.stack label { color: var(--muted); font-size: .82rem; font-weight: 700; } .stack label { color: var(--muted); font-size: .82rem; font-weight: 700; }
@@ -100,6 +102,11 @@ textarea:focus { border-color: var(--deep-sage); box-shadow: 0 0 0 4px rgba(85,
.list-card-copy { display: grid; flex: 1; gap: 2px; } .list-card-copy { display: grid; flex: 1; gap: 2px; }
.list-card-copy small { color: var(--muted); font-size: .75rem; } .list-card-copy small { color: var(--muted); font-size: .75rem; }
.list-card-arrow { color: var(--muted); font-size: 1.25rem; } .list-card-arrow { color: var(--muted); font-size: 1.25rem; }
.archived-list-card { opacity: .72; }
.archived-list-card .list-card-icon { color: var(--muted); background: #eef0ea; }
.archived-list-card .list-card-copy { align-items: flex-start; }
.archived-list-card form { margin-left: auto; }
.archived-banner { margin-bottom: 18px; padding: 11px 14px; border: 1px solid var(--line); border-radius: 12px; color: var(--muted); background: #f1f3ec; font-size: .82rem; font-weight: 700; }
.empty-state { padding: 35px 18px 24px; text-align: center; color: var(--muted); } .empty-state { padding: 35px 18px 24px; text-align: center; color: var(--muted); }
.empty-mark { display: grid; place-items: center; width: 50px; height: 50px; margin: 0 auto 15px; border-radius: 18px; color: var(--deep-sage); background: #edf3e8; font-size: 1.8rem; } .empty-mark { display: grid; place-items: center; width: 50px; height: 50px; margin: 0 auto 15px; border-radius: 18px; color: var(--deep-sage); background: #edf3e8; font-size: 1.8rem; }
.empty-state h3 { color: var(--ink); } .empty-state h3 { color: var(--ink); }
@@ -152,6 +159,8 @@ textarea:focus { border-color: var(--deep-sage); box-shadow: 0 0 0 4px rgba(85,
.check-form { flex: 0 0 auto; } .check-form { flex: 0 0 auto; }
.check-button { display: grid; place-items: center; width: 28px; height: 28px; padding: 0; border: 2px solid #c8d6c1; border-radius: 9px; color: #fff; background: transparent; cursor: pointer; font-size: .88rem; font-weight: 900; } .check-button { display: grid; place-items: center; width: 28px; height: 28px; padding: 0; border: 2px solid #c8d6c1; border-radius: 9px; color: #fff; background: transparent; cursor: pointer; font-size: .88rem; font-weight: 900; }
.is-checked .check-button { border-color: var(--deep-sage); background: var(--deep-sage); } .is-checked .check-button { border-color: var(--deep-sage); background: var(--deep-sage); }
.check-button-static { cursor: default; }
.is-checked .check-button-static { border-color: var(--deep-sage); background: var(--deep-sage); }
.item-copy { display: grid; grid-template-columns: auto 1fr; flex: 1; min-width: 0; gap: 2px 7px; align-items: baseline; } .item-copy { display: grid; grid-template-columns: auto 1fr; flex: 1; min-width: 0; gap: 2px 7px; align-items: baseline; }
.item-copy strong { grid-column: 2; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .item-copy strong { grid-column: 2; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.item-qty { grid-column: 1; grid-row: 1; color: var(--muted); font-weight: 700; white-space: nowrap; } .item-qty { grid-column: 1; grid-row: 1; color: var(--muted); font-weight: 700; white-space: nowrap; }
@@ -220,6 +229,8 @@ textarea:focus { border-color: var(--deep-sage); box-shadow: 0 0 0 4px rgba(85,
.edit-form { margin-bottom: 12px; } .edit-form { margin-bottom: 12px; }
.edit-form input { min-height: 38px; padding: 7px 10px; font-size: .85rem; } .edit-form input { min-height: 38px; padding: 7px 10px; font-size: .85rem; }
.danger-link { padding: 0; border: 0; color: var(--coral); background: none; cursor: pointer; font-size: .8rem; font-weight: 800; } .danger-link { padding: 0; border: 0; color: var(--coral); background: none; cursor: pointer; font-size: .8rem; font-weight: 800; }
.bordered-delete { padding: 7px 14px; border: 1px solid var(--coral); border-radius: 10px; background: none; }
.bordered-delete:hover { background: #fbeae4; }
.button-danger { width: 100%; color: var(--coral); background: #fbeae4; } .button-danger { width: 100%; color: var(--coral); background: #fbeae4; }
.button-danger:hover { background: #f7ddd4; } .button-danger:hover { background: #f7ddd4; }
.empty-items { padding: 34px 10px 18px; color: var(--muted); text-align: center; } .empty-items { padding: 34px 10px 18px; color: var(--muted); text-align: center; }