From 4d96ec8b95711e2eb7533e48eac7b40f9c41505b Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 12:46:43 +1100 Subject: [PATCH 01/40] Add paging feature design spec Co-Authored-By: Claude Opus 4.6 --- .../specs/2026-03-22-paging-design.md | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 docs/superpowers/specs/2026-03-22-paging-design.md diff --git a/docs/superpowers/specs/2026-03-22-paging-design.md b/docs/superpowers/specs/2026-03-22-paging-design.md new file mode 100644 index 0000000..80e3ee6 --- /dev/null +++ b/docs/superpowers/specs/2026-03-22-paging-design.md @@ -0,0 +1,100 @@ +# Paging Feature Design + +## Overview + +Introduce offset-based pagination to the admin post list and the generated static site (both post listings and category listings). + +## Data Layer + +### New `sites` column + +Add `posts_per_page INTEGER NOT NULL DEFAULT 10` to the `sites` table. This setting controls the number of posts per page on the **generated static site only**. + +### New SQL queries + +- `CountPostsOfSite(siteID, showDeleted)` — returns total post count for the site +- `CountPostsOfCategory(categoryID)` — returns total published post count for a category + +### Model changes + +**`models.Site`** — add field: +```go +PostsPerPage int +``` + +**New shared type** (`models/paging.go`): +```go +type PageInfo struct { + CurrentPage int + TotalPages int + PostsPerPage int +} +``` + +Existing `db.PagingParams` and queries (`SelectPostsOfSite`, `SelectPostsOfCategory`) already support `LIMIT/OFFSET` and remain unchanged. + +## Admin Section + +### Post list pagination + +- **Page size: hardcoded at 25** (not tied to the `PostsPerPage` site setting) +- Handler (`handlers/posts.go` `Index()`) reads a `page` query parameter (default 1) +- Computes offset as `(page - 1) * 25` +- Fetches total post count via new `CountPosts()` service method to build `PageInfo` +- Passes `PageInfo` to template + +### Service changes + +- `ListPosts()` accepts paging params from the handler instead of hardcoding them +- New `CountPosts()` method that calls the count query + +### Template (`views/posts/index.html`) + +- Full numbered pagination with Previous/Next below the post list: `< 1 2 3 ... 10 >` +- Preserves existing query params (e.g. `?filter=deleted`) when paginating +- Both regular post list and trash view are paginated + +### Site settings form + +- Add "Posts per page" number input to `views/sitesettings/general.html` +- Add `PostsPerPage` field to `UpdateSiteSettingsParams` +- Server-side validation: minimum 1, maximum 100 + +## Generated Static Site + +### URL structure + +Post listing pages: +- `/posts/` — page 1 +- `/posts/page/2/` — page 2 +- `/posts/page/N/` — page N + +Category listing pages: +- `/categories//` — page 1 +- `/categories//page/2/` — page 2 +- `/categories//page/N/` — page N + +### Site root + +`/` (site root) shows the same content as `/posts/` (page 1 of all posts). + +### Builder changes (`providers/sitebuilder/builder.go`) + +- Instead of rendering one `posts_list.html` with all posts, generate multiple page files +- Uses `site.PostsPerPage` from the site setting to determine page size +- Same pattern for category pages + +### Publisher changes (`services/publisher/iter.go`) + +- Existing iterator fetches posts in batches of 50 internally — this stays as-is +- The builder chunks posts into pages of `PostsPerPage` size and renders each page as a separate HTML file + +### Template (`layouts/simplecss/templates/posts_list.html`) + +- Receives `PageInfo` plus the posts for that page +- Renders **Previous / Next** links only (no numbered pagination) +- Previous link hidden on page 1; Next link hidden on last page + +## Approach + +Offset-based pagination using the existing `db.PagingParams` infrastructure. Page number maps to offset: `offset = (page - 1) * postsPerPage`. From 7c4dc0885e444f7ce95571dd572765e90f9bf87d Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 13:12:28 +1100 Subject: [PATCH 02/40] Add paging implementation plan Co-Authored-By: Claude Opus 4.6 --- docs/superpowers/plans/2026-03-22-paging.md | 888 ++++++++++++++++++++ 1 file changed, 888 insertions(+) create mode 100644 docs/superpowers/plans/2026-03-22-paging.md diff --git a/docs/superpowers/plans/2026-03-22-paging.md b/docs/superpowers/plans/2026-03-22-paging.md new file mode 100644 index 0000000..9b44775 --- /dev/null +++ b/docs/superpowers/plans/2026-03-22-paging.md @@ -0,0 +1,888 @@ +# Paging Feature Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Add offset-based pagination to the admin post list and the generated static site (posts and category listings). + +**Architecture:** Add a `posts_per_page` column to the `sites` table for configurable page size on the generated site. Admin uses a hardcoded page size of 25. The existing `db.PagingParams` and `LIMIT/OFFSET` SQL infrastructure is reused. A shared `models.PageInfo` type carries pagination state to templates. + +**Tech Stack:** Go, SQLite, sqlc, Fiber v3, html/template, Bootstrap + +--- + +### Task 1: Add `posts_per_page` column and regenerate sqlc + +**Files:** +- Create: `sql/schema/05_posts_per_page.up.sql` +- Modify: `sql/queries/sites.sql:10-19` (InsertSite query) +- Modify: `sql/queries/sites.sql:24-25` (UpdateSite query) +- Regenerate: `providers/db/gen/sqlgen/` (sqlc output) + +- [ ] **Step 1: Create migration file** + +Create `sql/schema/05_posts_per_page.up.sql`: +```sql +ALTER TABLE sites ADD COLUMN posts_per_page INTEGER NOT NULL DEFAULT 10; +``` + +- [ ] **Step 2: Update the InsertSite SQL query** + +In `sql/queries/sites.sql`, update the InsertSite query (lines 10-19) to include `posts_per_page`: +```sql +-- name: InsertSite :one +INSERT INTO sites ( + owner_id, + guid, + title, + tagline, + timezone, + posts_per_page, + created_at +) VALUES (?, ?, ?, ?, ?, ?, ?) +RETURNING id; +``` + +- [ ] **Step 3: Update the UpdateSite SQL query** + +In `sql/queries/sites.sql`, update line 24-25: +```sql +-- name: UpdateSite :exec +UPDATE sites SET title = ?, tagline = ?, timezone = ?, posts_per_page = ? WHERE id = ?; +``` + +- [ ] **Step 4: Regenerate sqlc** + +Run: `sqlc generate` +Expected: `providers/db/gen/sqlgen/` files updated with new `PostsPerPage` field on `Site` struct, updated `InsertSiteParams` and `UpdateSiteParams`. + +- [ ] **Step 5: Run tests to verify nothing broke** + +Run: `go test ./...` +Expected: All existing tests pass. + +- [ ] **Step 6: Commit** + +```bash +git add sql/schema/05_posts_per_page.up.sql sql/queries/sites.sql providers/db/gen/sqlgen/ +git commit -m "feat: add posts_per_page column to sites table" +``` + +--- + +### Task 2: Update Site model and DB provider for `PostsPerPage` + +**Files:** +- Modify: `models/sites.go:24-33` (Site struct) +- Modify: `providers/db/sites.go:42-65` (SaveSite) +- Modify: `providers/db/sites.go:102-112` (dbSiteToSite) + +- [ ] **Step 1: Add `PostsPerPage` to `models.Site`** + +In `models/sites.go`, add to the `Site` struct (after `Timezone`): +```go +PostsPerPage int +``` + +- [ ] **Step 2: Update `dbSiteToSite` in `providers/db/sites.go`** + +In `providers/db/sites.go`, update `dbSiteToSite` (line 102) to map the new field: +```go +func dbSiteToSite(row sqlgen.Site) models.Site { + return models.Site{ + ID: row.ID, + OwnerID: row.OwnerID, + GUID: row.Guid, + Title: row.Title, + Timezone: row.Timezone, + Tagline: row.Tagline, + PostsPerPage: int(row.PostsPerPage), + Created: time.Unix(row.CreatedAt, 0).UTC(), + } +} +``` + +- [ ] **Step 3: Update `SaveSite` to include `PostsPerPage`** + +In `providers/db/sites.go`, update the `InsertSite` call (line 44) to include `PostsPerPage`: +```go +newID, err := db.queries.InsertSite(ctx, sqlgen.InsertSiteParams{ + OwnerID: site.OwnerID, + Guid: site.GUID, + Title: site.Title, + Tagline: site.Tagline, + Timezone: site.Timezone, + PostsPerPage: int64(site.PostsPerPage), + CreatedAt: timeToInt(site.Created), +}) +``` + +Update the `UpdateSite` call (line 59) to include `PostsPerPage`: +```go +return db.queries.UpdateSite(ctx, sqlgen.UpdateSiteParams{ + Title: site.Title, + Tagline: site.Tagline, + Timezone: site.Timezone, + PostsPerPage: int64(site.PostsPerPage), + ID: site.ID, +}) +``` + +- [ ] **Step 4: Run tests** + +Run: `go test ./...` +Expected: All tests pass. + +- [ ] **Step 5: Commit** + +```bash +git add models/sites.go providers/db/sites.go sql/queries/sites.sql providers/db/gen/sqlgen/ +git commit -m "feat: add PostsPerPage to Site model and DB provider" +``` + +--- + +### Task 3: Add `CountPostsOfSite` SQL query and DB method + +**Files:** +- Modify: `sql/queries/posts.sql` (add count query) +- Modify: `providers/db/posts.go` (add CountPostsOfSite method) +- Modify: `providers/db/provider_test.go` (add test) +- Regenerate: `providers/db/gen/sqlgen/` + +- [ ] **Step 1: Write the failing test** + +Add to `providers/db/provider_test.go` inside `TestProvider_Posts`: +```go +t.Run("count posts of site", func(t *testing.T) { + countSite := &models.Site{ + OwnerID: user.ID, + GUID: models.NewNanoID(), + Title: "Count Blog", + } + require.NoError(t, p.SaveSite(ctx, countSite)) + + now := time.Date(2026, 3, 22, 12, 0, 0, 0, time.UTC) + for i := 0; i < 3; i++ { + post := &models.Post{ + SiteID: countSite.ID, + GUID: models.NewNanoID(), + Title: fmt.Sprintf("Post %d", i), + Body: "body", + Slug: fmt.Sprintf("/post-%d", i), + CreatedAt: now, + } + require.NoError(t, p.SavePost(ctx, post)) + } + + count, err := p.CountPostsOfSite(ctx, countSite.ID, false) + require.NoError(t, err) + assert.Equal(t, int64(3), count) + + // Soft-delete one post + posts, err := p.SelectPostsOfSite(ctx, countSite.ID, false, db.PagingParams{Limit: 10, Offset: 0}) + require.NoError(t, err) + require.NoError(t, p.SoftDeletePost(ctx, posts[0].ID)) + + count, err = p.CountPostsOfSite(ctx, countSite.ID, false) + require.NoError(t, err) + assert.Equal(t, int64(2), count) + + count, err = p.CountPostsOfSite(ctx, countSite.ID, true) + require.NoError(t, err) + assert.Equal(t, int64(1), count) +}) +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `go test ./providers/db/ -run TestProvider_Posts/count_posts_of_site -v` +Expected: FAIL — `CountPostsOfSite` method does not exist. + +- [ ] **Step 3: Add SQL query** + +Add to `sql/queries/posts.sql`: +```sql +-- name: CountPostsOfSite :one +SELECT COUNT(*) FROM posts +WHERE site_id = sqlc.arg(site_id) AND ( + CASE CAST (sqlc.arg(post_filter) AS TEXT) + WHEN 'deleted' THEN deleted_at > 0 + ELSE deleted_at = 0 + END +); +``` + +Run: `sqlc generate` + +- [ ] **Step 4: Add DB provider method** + +Add to `providers/db/posts.go`: +```go +func (db *Provider) CountPostsOfSite(ctx context.Context, siteID int64, showDeleted bool) (int64, error) { + filter := "active" + if showDeleted { + filter = "deleted" + } + return db.queries.CountPostsOfSite(ctx, sqlgen.CountPostsOfSiteParams{ + SiteID: siteID, + PostFilter: filter, + }) +} +``` + +Note: check the generated `sqlgen.CountPostsOfSiteParams` struct name and fields after `sqlc generate` — adjust if the field names differ. + +- [ ] **Step 5: Run test to verify it passes** + +Run: `go test ./providers/db/ -run TestProvider_Posts/count_posts_of_site -v` +Expected: PASS + +- [ ] **Step 6: Run all tests** + +Run: `go test ./...` +Expected: All pass. + +- [ ] **Step 7: Commit** + +```bash +git add sql/queries/posts.sql providers/db/posts.go providers/db/provider_test.go providers/db/gen/sqlgen/ +git commit -m "feat: add CountPostsOfSite query and DB method" +``` + +--- + +### Task 4: Add `models.PageInfo` type + +**Files:** +- Create: `models/paging.go` + +- [ ] **Step 1: Create `models/paging.go`** + +```go +package models + +// PageInfo carries pagination state for templates. +type PageInfo struct { + CurrentPage int + TotalPages int + PostsPerPage int +} + +// HasPrevious returns true if there is a previous page. +func (p PageInfo) HasPrevious() bool { + return p.CurrentPage > 1 +} + +// HasNext returns true if there is a next page. +func (p PageInfo) HasNext() bool { + return p.CurrentPage < p.TotalPages +} + +// PreviousPage returns the previous page number. +func (p PageInfo) PreviousPage() int { + return p.CurrentPage - 1 +} + +// NextPage returns the next page number. +func (p PageInfo) NextPage() int { + return p.CurrentPage + 1 +} +``` + +- [ ] **Step 2: Run tests** + +Run: `go test ./...` +Expected: All pass (no tests yet for this type, but it should compile). + +- [ ] **Step 3: Commit** + +```bash +git add models/paging.go +git commit -m "feat: add PageInfo model for pagination" +``` + +--- + +### Task 5: Add pagination to admin post list (service + handler) + +**Files:** +- Modify: `services/posts/list.go:15-38` (ListPosts signature and implementation) +- Modify: `handlers/posts.go:18-39` (Index handler) + +- [ ] **Step 1: Update `ListPosts` to accept paging params and return count** + +Replace `services/posts/list.go` `ListPosts` method: +```go +type ListPostsResult struct { + Posts []*PostWithCategories + TotalCount int64 +} + +func (s *Service) ListPosts(ctx context.Context, showDeleted bool, paging db.PagingParams) (ListPostsResult, error) { + site, ok := models.GetSite(ctx) + if !ok { + return ListPostsResult{}, models.SiteRequiredError + } + + posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted, paging) + if err != nil { + return ListPostsResult{}, err + } + + count, err := s.db.CountPostsOfSite(ctx, site.ID, showDeleted) + if err != nil { + return ListPostsResult{}, err + } + + result := make([]*PostWithCategories, len(posts)) + for i, post := range posts { + cats, err := s.db.SelectCategoriesOfPost(ctx, post.ID) + if err != nil { + return ListPostsResult{}, err + } + result[i] = &PostWithCategories{Post: post, Categories: cats} + } + return ListPostsResult{Posts: result, TotalCount: count}, nil +} +``` + +- [ ] **Step 2: Update the admin handler** + +Replace `handlers/posts.go` `Index` method: +```go +func (ph PostsHandler) Index(c fiber.Ctx) error { + var req struct { + Filter string `query:"filter"` + Page int `query:"page"` + } + if err := c.Bind().Query(&req); err != nil { + return fiber.ErrBadRequest + } + + const perPage = 25 + if req.Page < 1 { + req.Page = 1 + } + + result, err := ph.PostService.ListPosts(c.Context(), req.Filter == "deleted", db.PagingParams{ + Offset: int64((req.Page - 1) * perPage), + Limit: perPage, + }) + if err != nil { + return err + } + + totalPages := int(result.TotalCount+int64(perPage)-1) / perPage + if totalPages < 1 { + totalPages = 1 + } + + pageInfo := models.PageInfo{ + CurrentPage: req.Page, + TotalPages: totalPages, + PostsPerPage: perPage, + } + + return accepts(c, json(func() any { + return result.Posts + }), html(func(c fiber.Ctx) error { + return c.Render("posts/index", fiber.Map{ + "req": req, + "posts": result.Posts, + "pageInfo": pageInfo, + }) + })) +} +``` + +Note: add `"lmika.dev/lmika/weiro/providers/db"` and `"lmika.dev/lmika/weiro/models"` to imports in `handlers/posts.go`. + +- [ ] **Step 3: Verify it compiles** + +Run: `go build ./...` +Expected: Compiles successfully. + +- [ ] **Step 4: Run tests** + +Run: `go test ./...` +Expected: All pass. + +- [ ] **Step 5: Commit** + +```bash +git add services/posts/list.go handlers/posts.go +git commit -m "feat: add pagination to admin post list handler and service" +``` + +--- + +### Task 6: Add pagination UI to admin post list template + +**Files:** +- Modify: `views/posts/index.html` + +- [ ] **Step 1: Add pagination controls to admin template** + +Add pagination controls after the post list in `views/posts/index.html`. Insert before the closing `` tag: + +```html +{{ if gt .pageInfo.TotalPages 1 }} + +{{ end }} +``` + +- [ ] **Step 2: Add `Pages` method to `PageInfo`** + +Add to `models/paging.go`: +```go +// Pages returns a slice of page numbers for rendering numbered pagination. +func (p PageInfo) Pages() []int { + pages := make([]int, p.TotalPages) + for i := range pages { + pages[i] = i + 1 + } + return pages +} +``` + +- [ ] **Step 3: Verify it compiles and test manually** + +Run: `go build ./...` +Expected: Compiles. + +- [ ] **Step 4: Commit** + +```bash +git add views/posts/index.html models/paging.go +git commit -m "feat: add pagination controls to admin post list" +``` + +--- + +### Task 7: Add site settings form for `PostsPerPage` + +**Files:** +- Modify: `views/sitesettings/general.html:17-48` (form) +- Modify: `services/sites/services.go:131-158` (UpdateSiteSettingsParams and UpdateSiteSettings) + +- [ ] **Step 1: Add `PostsPerPage` to `UpdateSiteSettingsParams`** + +In `services/sites/services.go`, update the struct (line 131): +```go +type UpdateSiteSettingsParams struct { + SiteID int64 `form:"siteID"` + Name string `form:"name"` + Tagline string `form:"tagline"` + Timezone string `form:"timezone"` + PostsPerPage int `form:"postsPerPage"` +} +``` + +- [ ] **Step 2: Update `UpdateSiteSettings` to handle `PostsPerPage`** + +In `services/sites/services.go`, update `UpdateSiteSettings` (line 138) to validate and set the new field: +```go +func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSettingsParams) (models.Site, error) { + site, err := s.GetSiteByID(ctx, params.SiteID) + if err != nil { + return models.Site{}, err + } + + _, err = time.LoadLocation(params.Timezone) + if err != nil { + return models.Site{}, errors.Wrap(err, "invalid timezone") + } + + postsPerPage := params.PostsPerPage + if postsPerPage < 1 { + postsPerPage = 1 + } else if postsPerPage > 100 { + postsPerPage = 100 + } + + site.Title = params.Name + site.Tagline = params.Tagline + site.Timezone = params.Timezone + site.PostsPerPage = postsPerPage + + if err := s.db.SaveSite(ctx, &site); err != nil { + return models.Site{}, err + } + + return site, nil +} +``` + +- [ ] **Step 3: Add form field to settings template** + +In `views/sitesettings/general.html`, add after the Timezone field (after line 43, before the submit button row): +```html +
+ +
+ +
Number of posts per page on the generated site.
+
+
+``` + +- [ ] **Step 4: Verify it compiles** + +Run: `go build ./...` +Expected: Compiles. + +- [ ] **Step 5: Commit** + +```bash +git add services/sites/services.go views/sitesettings/general.html +git commit -m "feat: add posts per page setting to site settings" +``` + +--- + +### Task 8: Add pagination to generated site post list + +**Files:** +- Modify: `providers/sitebuilder/tmpls.go:62-65` (postListData) +- Modify: `providers/sitebuilder/builder.go:124-146` (renderPostListWithCategories) +- Modify: `layouts/simplecss/templates/posts_list.html` + +- [ ] **Step 1: Update `postListData` to include `PageInfo`** + +In `providers/sitebuilder/tmpls.go`, update `postListData` (line 62): +```go +type postListData struct { + commonData + Posts []postSingleData + PageInfo models.PageInfo + PrevURL string + NextURL string +} +``` + +- [ ] **Step 2: Rewrite `renderPostListWithCategories` to paginate** + +Replace `renderPostListWithCategories` in `providers/sitebuilder/builder.go` (line 124): +```go +func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Context) error { + // Collect all posts + var allPosts []postSingleData + for mp := range b.site.PostIter(ctx) { + post, err := mp.Get() + if err != nil { + return err + } + rp, err := b.renderPostWithCategories(ctx, post) + if err != nil { + return err + } + allPosts = append(allPosts, rp) + } + + postsPerPage := b.site.PostsPerPage + if postsPerPage < 1 { + postsPerPage = 10 + } + + totalPages := (len(allPosts) + postsPerPage - 1) / postsPerPage + if totalPages < 1 { + totalPages = 1 + } + + for page := 1; page <= totalPages; page++ { + start := (page - 1) * postsPerPage + end := start + postsPerPage + if end > len(allPosts) { + end = len(allPosts) + } + + pageInfo := models.PageInfo{ + CurrentPage: page, + TotalPages: totalPages, + PostsPerPage: postsPerPage, + } + + var prevURL, nextURL string + if page > 1 { + if page == 2 { + prevURL = "/posts/" + } else { + prevURL = fmt.Sprintf("/posts/page/%d/", page-1) + } + } + if page < totalPages { + nextURL = fmt.Sprintf("/posts/page/%d/", page+1) + } + + pl := postListData{ + commonData: commonData{Site: b.site}, + Posts: allPosts[start:end], + PageInfo: pageInfo, + PrevURL: prevURL, + NextURL: nextURL, + } + + // Determine output path(s) for this page + var paths []string + if page == 1 { + // Page 1 renders at both root and /posts/ + paths = []string{"", "/posts"} + } else { + paths = []string{fmt.Sprintf("/posts/page/%d", page)} + } + + for _, path := range paths { + if err := b.createAtPath(bctx, path, func(f io.Writer) error { + return b.renderTemplate(f, tmplNamePostList, pl) + }); err != nil { + return err + } + } + } + + return nil +} +``` + +- [ ] **Step 3: Update the post list template with prev/next links** + +Replace `layouts/simplecss/templates/posts_list.html`: +```html +{{ range .Posts }} +
+ {{ if .Post.Title }}

{{ .Post.Title }}

{{ end }} + {{ .HTML }} + {{ template "_post_meta.html" . }} +
+{{ end }} +{{ if or .PrevURL .NextURL }} + +{{ end }} +``` + +- [ ] **Step 4: Run tests** + +Run: `go test ./...` +Expected: Existing builder test may need updating (see next step). + +- [ ] **Step 5: Update builder test** + +The test in `providers/sitebuilder/builder_test.go` creates a `pubmodel.Site` without `PostsPerPage`, which will default to 0. Update the test site to set `PostsPerPage`: +```go +site := pubmodel.Site{ + Site: models.Site{PostsPerPage: 10}, + BaseURL: "https://example.com", + PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] { + // ... existing code ... + }, +} +``` + +The expected `index.html` content stays the same since both posts fit on one page. + +- [ ] **Step 6: Run tests** + +Run: `go test ./...` +Expected: All pass. + +- [ ] **Step 7: Commit** + +```bash +git add providers/sitebuilder/tmpls.go providers/sitebuilder/builder.go layouts/simplecss/templates/posts_list.html providers/sitebuilder/builder_test.go +git commit -m "feat: add pagination to generated site post list" +``` + +--- + +### Task 9: Add pagination to generated site category pages + +**Files:** +- Modify: `providers/sitebuilder/tmpls.go:82-88` (categorySingleData) +- Modify: `providers/sitebuilder/builder.go:315-362` (renderCategoryPages) +- Modify: `layouts/simplecss/templates/categories_single.html` + +- [ ] **Step 1: Update `categorySingleData` to include pagination** + +In `providers/sitebuilder/tmpls.go`, update `categorySingleData` (line 82): +```go +type categorySingleData struct { + commonData + Category *models.Category + DescriptionHTML template.HTML + Posts []postSingleData + Path string + PageInfo models.PageInfo + PrevURL string + NextURL string +} +``` + +- [ ] **Step 2: Rewrite `renderCategoryPages` to paginate** + +Replace `renderCategoryPages` in `providers/sitebuilder/builder.go` (line 315): +```go +func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) error { + for _, cwc := range b.site.Categories { + if cwc.PostCount == 0 { + continue + } + + // Collect all posts for this category + var allPosts []postSingleData + for mp := range b.site.PostIterByCategory(goCtx, cwc.ID) { + post, err := mp.Get() + if err != nil { + return err + } + rp, err := b.renderPostWithCategories(goCtx, post) + if err != nil { + return err + } + allPosts = append(allPosts, rp) + } + + var descHTML bytes.Buffer + if cwc.Description != "" { + if err := b.mdRenderer.RenderTo(goCtx, &descHTML, cwc.Description); err != nil { + return err + } + } + + postsPerPage := b.site.PostsPerPage + if postsPerPage < 1 { + postsPerPage = 10 + } + + totalPages := (len(allPosts) + postsPerPage - 1) / postsPerPage + if totalPages < 1 { + totalPages = 1 + } + + basePath := fmt.Sprintf("/categories/%s", cwc.Slug) + + for page := 1; page <= totalPages; page++ { + start := (page - 1) * postsPerPage + end := start + postsPerPage + if end > len(allPosts) { + end = len(allPosts) + } + + pageInfo := models.PageInfo{ + CurrentPage: page, + TotalPages: totalPages, + PostsPerPage: postsPerPage, + } + + var prevURL, nextURL string + if page > 1 { + if page == 2 { + prevURL = basePath + "/" + } else { + prevURL = fmt.Sprintf("%s/page/%d/", basePath, page-1) + } + } + if page < totalPages { + nextURL = fmt.Sprintf("%s/page/%d/", basePath, page+1) + } + + path := basePath + if page > 1 { + path = fmt.Sprintf("%s/page/%d", basePath, page) + } + + data := categorySingleData{ + commonData: commonData{Site: b.site}, + Category: &cwc.Category, + DescriptionHTML: template.HTML(descHTML.String()), + Posts: allPosts[start:end], + Path: path, + PageInfo: pageInfo, + PrevURL: prevURL, + NextURL: nextURL, + } + + if err := b.createAtPath(ctx, path, func(f io.Writer) error { + return b.renderTemplate(f, tmplNameCategorySingle, data) + }); err != nil { + return err + } + } + + // Per-category feeds (use all posts, not paginated) + if err := b.renderCategoryFeed(ctx, cwc, allPosts); err != nil { + return err + } + } + + return nil +} +``` + +- [ ] **Step 3: Update category single template with prev/next links** + +Replace `layouts/simplecss/templates/categories_single.html`: +```html +{{ if .DescriptionHTML }}
{{ .DescriptionHTML }}
{{ end }} +{{ range .Posts }} +
+ {{ if .Post.Title }}

{{ .Post.Title }}

{{ end }} + {{ .HTML }} + {{ template "_post_meta.html" . }} +
+{{ end }} +{{ if or .PrevURL .NextURL }} + +{{ end }} +``` + +Note: check the current content of `categories_single.html` first — preserve any existing structure (like `

` headings) that may not have been captured in the exploration. Read the file before editing. + +- [ ] **Step 4: Run tests** + +Run: `go test ./...` +Expected: All pass. + +- [ ] **Step 5: Commit** + +```bash +git add providers/sitebuilder/tmpls.go providers/sitebuilder/builder.go layouts/simplecss/templates/categories_single.html +git commit -m "feat: add pagination to generated site category pages" +``` + +--- + +### Task 10: Final verification + +- [ ] **Step 1: Run full test suite** + +Run: `go test ./...` +Expected: All tests pass. + +- [ ] **Step 2: Build the project** + +Run: `go build ./...` +Expected: Clean build with no errors. + +- [ ] **Step 3: Commit any remaining changes** + +If any files were missed, stage and commit them. From 9b36a35c1a0ef455376482c6c63d8405cfac2892 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:26:09 +1100 Subject: [PATCH 03/40] feat: add posts_per_page column to sites table Co-Authored-By: Claude Sonnet 4.6 --- providers/db/gen/sqlgen/models.go | 15 ++++++----- providers/db/gen/sqlgen/sites.sql.go | 38 +++++++++++++++++----------- sql/queries/sites.sql | 5 ++-- sql/schema/05_posts_per_page.up.sql | 1 + 4 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 sql/schema/05_posts_per_page.up.sql diff --git a/providers/db/gen/sqlgen/models.go b/providers/db/gen/sqlgen/models.go index 788c292..ae58594 100644 --- a/providers/db/gen/sqlgen/models.go +++ b/providers/db/gen/sqlgen/models.go @@ -57,13 +57,14 @@ type PublishTarget struct { } type Site struct { - ID int64 - OwnerID int64 - Guid string - Title string - Tagline string - CreatedAt int64 - Timezone string + ID int64 + OwnerID int64 + Guid string + Title string + Tagline string + CreatedAt int64 + Timezone string + PostsPerPage int64 } type Upload struct { diff --git a/providers/db/gen/sqlgen/sites.sql.go b/providers/db/gen/sqlgen/sites.sql.go index bd80fb3..80ccbc0 100644 --- a/providers/db/gen/sqlgen/sites.sql.go +++ b/providers/db/gen/sqlgen/sites.sql.go @@ -28,18 +28,20 @@ INSERT INTO sites ( title, tagline, timezone, + posts_per_page, created_at -) VALUES (?, ?, ?, ?, ?, ?) +) VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id ` type InsertSiteParams struct { - OwnerID int64 - Guid string - Title string - Tagline string - Timezone string - CreatedAt int64 + OwnerID int64 + Guid string + Title string + Tagline string + Timezone string + PostsPerPage int64 + CreatedAt int64 } func (q *Queries) InsertSite(ctx context.Context, arg InsertSiteParams) (int64, error) { @@ -49,6 +51,7 @@ func (q *Queries) InsertSite(ctx context.Context, arg InsertSiteParams) (int64, arg.Title, arg.Tagline, arg.Timezone, + arg.PostsPerPage, arg.CreatedAt, ) var id int64 @@ -101,7 +104,7 @@ func (q *Queries) SelectAllSitesWithOwners(ctx context.Context) ([]SelectAllSite } const selectSiteByGUID = `-- name: SelectSiteByGUID :one -SELECT id, owner_id, guid, title, tagline, created_at, timezone FROM sites WHERE guid = ? +SELECT id, owner_id, guid, title, tagline, created_at, timezone, posts_per_page FROM sites WHERE guid = ? ` func (q *Queries) SelectSiteByGUID(ctx context.Context, guid string) (Site, error) { @@ -115,12 +118,13 @@ func (q *Queries) SelectSiteByGUID(ctx context.Context, guid string) (Site, erro &i.Tagline, &i.CreatedAt, &i.Timezone, + &i.PostsPerPage, ) return i, err } const selectSiteByID = `-- name: SelectSiteByID :one -SELECT id, owner_id, guid, title, tagline, created_at, timezone FROM sites WHERE id = ? +SELECT id, owner_id, guid, title, tagline, created_at, timezone, posts_per_page FROM sites WHERE id = ? ` func (q *Queries) SelectSiteByID(ctx context.Context, id int64) (Site, error) { @@ -134,12 +138,13 @@ func (q *Queries) SelectSiteByID(ctx context.Context, id int64) (Site, error) { &i.Tagline, &i.CreatedAt, &i.Timezone, + &i.PostsPerPage, ) return i, err } const selectSitesOwnedByUser = `-- name: SelectSitesOwnedByUser :many -SELECT id, owner_id, guid, title, tagline, created_at, timezone FROM sites WHERE owner_id = ? ORDER BY title ASC +SELECT id, owner_id, guid, title, tagline, created_at, timezone, posts_per_page FROM sites WHERE owner_id = ? ORDER BY title ASC ` func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([]Site, error) { @@ -159,6 +164,7 @@ func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([] &i.Tagline, &i.CreatedAt, &i.Timezone, + &i.PostsPerPage, ); err != nil { return nil, err } @@ -174,14 +180,15 @@ func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([] } const updateSite = `-- name: UpdateSite :exec -UPDATE sites SET title = ?, tagline = ?, timezone = ? WHERE id = ? +UPDATE sites SET title = ?, tagline = ?, timezone = ?, posts_per_page = ? WHERE id = ? ` type UpdateSiteParams struct { - Title string - Tagline string - Timezone string - ID int64 + Title string + Tagline string + Timezone string + PostsPerPage int64 + ID int64 } func (q *Queries) UpdateSite(ctx context.Context, arg UpdateSiteParams) error { @@ -189,6 +196,7 @@ func (q *Queries) UpdateSite(ctx context.Context, arg UpdateSiteParams) error { arg.Title, arg.Tagline, arg.Timezone, + arg.PostsPerPage, arg.ID, ) return err diff --git a/sql/queries/sites.sql b/sql/queries/sites.sql index 8fe2469..0609b12 100644 --- a/sql/queries/sites.sql +++ b/sql/queries/sites.sql @@ -14,15 +14,16 @@ INSERT INTO sites ( title, tagline, timezone, + posts_per_page, created_at -) VALUES (?, ?, ?, ?, ?, ?) +) VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id; -- name: HasUsersAndSites :one SELECT (SELECT COUNT(*) FROM users) > 0 AND (SELECT COUNT(*) FROM sites) > 0 AS has_users_and_sites; -- name: UpdateSite :exec -UPDATE sites SET title = ?, tagline = ?, timezone = ? WHERE id = ?; +UPDATE sites SET title = ?, tagline = ?, timezone = ?, posts_per_page = ? WHERE id = ?; -- name: SelectAllSitesWithOwners :many SELECT s.id, s.guid, s.title, s.owner_id, u.username diff --git a/sql/schema/05_posts_per_page.up.sql b/sql/schema/05_posts_per_page.up.sql new file mode 100644 index 0000000..1bea8f9 --- /dev/null +++ b/sql/schema/05_posts_per_page.up.sql @@ -0,0 +1 @@ +ALTER TABLE sites ADD COLUMN posts_per_page INTEGER NOT NULL DEFAULT 10; From 9919f3444ad9d3a073eb08ed45ba4c6b1463f944 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:28:50 +1100 Subject: [PATCH 04/40] feat: add PostsPerPage to Site model and DB provider Co-Authored-By: Claude Sonnet 4.6 --- models/sites.go | 7 ++++--- providers/db/sites.go | 37 ++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/models/sites.go b/models/sites.go index 16cbef4..81bf6be 100644 --- a/models/sites.go +++ b/models/sites.go @@ -27,9 +27,10 @@ type Site struct { GUID string Created time.Time - Title string - Tagline string - Timezone string + Title string + Tagline string + Timezone string + PostsPerPage int } type SitePublishTarget struct { diff --git a/providers/db/sites.go b/providers/db/sites.go index 28d83f6..d1167ca 100644 --- a/providers/db/sites.go +++ b/providers/db/sites.go @@ -42,12 +42,13 @@ func (db *Provider) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ( func (db *Provider) SaveSite(ctx context.Context, site *models.Site) error { if site.ID == 0 { newID, err := db.queries.InsertSite(ctx, sqlgen.InsertSiteParams{ - OwnerID: site.OwnerID, - Guid: site.GUID, - Title: site.Title, - Tagline: site.Tagline, - Timezone: site.Timezone, - CreatedAt: timeToInt(site.Created), + OwnerID: site.OwnerID, + Guid: site.GUID, + Title: site.Title, + Tagline: site.Tagline, + Timezone: site.Timezone, + PostsPerPage: int64(site.PostsPerPage), + CreatedAt: timeToInt(site.Created), }) if err != nil { return err @@ -57,10 +58,11 @@ func (db *Provider) SaveSite(ctx context.Context, site *models.Site) error { } return db.queries.UpdateSite(ctx, sqlgen.UpdateSiteParams{ - Title: site.Title, - Tagline: site.Tagline, - Timezone: site.Timezone, - ID: site.ID, + Title: site.Title, + Tagline: site.Tagline, + Timezone: site.Timezone, + PostsPerPage: int64(site.PostsPerPage), + ID: site.ID, }) } @@ -101,12 +103,13 @@ func (db *Provider) SelectAllSitesWithOwners(ctx context.Context) ([]SiteWithOwn func dbSiteToSite(row sqlgen.Site) models.Site { return models.Site{ - ID: row.ID, - OwnerID: row.OwnerID, - GUID: row.Guid, - Title: row.Title, - Timezone: row.Timezone, - Tagline: row.Tagline, - Created: time.Unix(row.CreatedAt, 0).UTC(), + ID: row.ID, + OwnerID: row.OwnerID, + GUID: row.Guid, + Title: row.Title, + Timezone: row.Timezone, + Tagline: row.Tagline, + PostsPerPage: int(row.PostsPerPage), + Created: time.Unix(row.CreatedAt, 0).UTC(), } } From 5bf77ede5c6e0631de299b38d13dea4205864020 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:30:57 +1100 Subject: [PATCH 05/40] feat: add CountPostsOfSite query and DB method Co-Authored-By: Claude Sonnet 4.6 --- providers/db/gen/sqlgen/posts.sql.go | 22 +++++++++++++++ providers/db/posts.go | 11 ++++++++ providers/db/provider_test.go | 40 ++++++++++++++++++++++++++++ sql/queries/posts.sql | 9 +++++++ 4 files changed, 82 insertions(+) diff --git a/providers/db/gen/sqlgen/posts.sql.go b/providers/db/gen/sqlgen/posts.sql.go index 8bff191..ef3d170 100644 --- a/providers/db/gen/sqlgen/posts.sql.go +++ b/providers/db/gen/sqlgen/posts.sql.go @@ -9,6 +9,28 @@ import ( "context" ) +const countPostsOfSite = `-- name: CountPostsOfSite :one +SELECT COUNT(*) FROM posts +WHERE site_id = ?1 AND ( + CASE CAST (?2 AS TEXT) + WHEN 'deleted' THEN deleted_at > 0 + ELSE deleted_at = 0 + END +) +` + +type CountPostsOfSiteParams struct { + SiteID int64 + PostFilter string +} + +func (q *Queries) CountPostsOfSite(ctx context.Context, arg CountPostsOfSiteParams) (int64, error) { + row := q.db.QueryRowContext(ctx, countPostsOfSite, arg.SiteID, arg.PostFilter) + var count int64 + err := row.Scan(&count) + return count, err +} + const hardDeletePost = `-- name: HardDeletePost :exec DELETE FROM posts WHERE id = ? ` diff --git a/providers/db/posts.go b/providers/db/posts.go index 218e931..7f58d1a 100644 --- a/providers/db/posts.go +++ b/providers/db/posts.go @@ -13,6 +13,17 @@ type PagingParams struct { Offset int64 } +func (db *Provider) CountPostsOfSite(ctx context.Context, siteID int64, showDeleted bool) (int64, error) { + filter := "active" + if showDeleted { + filter = "deleted" + } + return db.queries.CountPostsOfSite(ctx, sqlgen.CountPostsOfSiteParams{ + SiteID: siteID, + PostFilter: filter, + }) +} + func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDeleted bool, pp PagingParams) ([]*models.Post, error) { var filter = "" if showDeleted { diff --git a/providers/db/provider_test.go b/providers/db/provider_test.go index 06f03c0..0a2e6df 100644 --- a/providers/db/provider_test.go +++ b/providers/db/provider_test.go @@ -3,6 +3,7 @@ package db_test import ( "context" "encoding/base64" + "fmt" "path/filepath" "testing" "time" @@ -229,6 +230,45 @@ func TestProvider_Posts(t *testing.T) { require.NoError(t, err) assert.Empty(t, posts) }) + + t.Run("count posts of site", func(t *testing.T) { + countSite := &models.Site{ + OwnerID: user.ID, + GUID: models.NewNanoID(), + Title: "Count Blog", + } + require.NoError(t, p.SaveSite(ctx, countSite)) + + now := time.Date(2026, 3, 22, 12, 0, 0, 0, time.UTC) + for i := 0; i < 3; i++ { + post := &models.Post{ + SiteID: countSite.ID, + GUID: models.NewNanoID(), + Title: fmt.Sprintf("Post %d", i), + Body: "body", + Slug: fmt.Sprintf("/post-%d", i), + CreatedAt: now, + } + require.NoError(t, p.SavePost(ctx, post)) + } + + count, err := p.CountPostsOfSite(ctx, countSite.ID, false) + require.NoError(t, err) + assert.Equal(t, int64(3), count) + + // Soft-delete one post + posts, err := p.SelectPostsOfSite(ctx, countSite.ID, false, db.PagingParams{Limit: 10, Offset: 0}) + require.NoError(t, err) + require.NoError(t, p.SoftDeletePost(ctx, posts[0].ID)) + + count, err = p.CountPostsOfSite(ctx, countSite.ID, false) + require.NoError(t, err) + assert.Equal(t, int64(2), count) + + count, err = p.CountPostsOfSite(ctx, countSite.ID, true) + require.NoError(t, err) + assert.Equal(t, int64(1), count) + }) } func TestProvider_PublishTargets(t *testing.T) { diff --git a/sql/queries/posts.sql b/sql/queries/posts.sql index dae1f39..5a4c18e 100644 --- a/sql/queries/posts.sql +++ b/sql/queries/posts.sql @@ -1,3 +1,12 @@ +-- name: CountPostsOfSite :one +SELECT COUNT(*) FROM posts +WHERE site_id = sqlc.arg(site_id) AND ( + CASE CAST (sqlc.arg(post_filter) AS TEXT) + WHEN 'deleted' THEN deleted_at > 0 + ELSE deleted_at = 0 + END +); + -- name: SelectPostsOfSite :many SELECT * FROM posts From 113789a972358ae0f1e82acbea8586b074a74f2f Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:32:02 +1100 Subject: [PATCH 06/40] feat: add PageInfo model for pagination Co-Authored-By: Claude Opus 4.6 --- models/paging.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 models/paging.go diff --git a/models/paging.go b/models/paging.go new file mode 100644 index 0000000..4ba0c9f --- /dev/null +++ b/models/paging.go @@ -0,0 +1,28 @@ +package models + +// PageInfo carries pagination state for templates. +type PageInfo struct { + CurrentPage int + TotalPages int + PostsPerPage int +} + +// HasPrevious returns true if there is a previous page. +func (p PageInfo) HasPrevious() bool { + return p.CurrentPage > 1 +} + +// HasNext returns true if there is a next page. +func (p PageInfo) HasNext() bool { + return p.CurrentPage < p.TotalPages +} + +// PreviousPage returns the previous page number. +func (p PageInfo) PreviousPage() int { + return p.CurrentPage - 1 +} + +// NextPage returns the next page number. +func (p PageInfo) NextPage() int { + return p.CurrentPage + 1 +} From 82feccf64aab94a2c85b7459aa40028d20e8a8fd Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:33:31 +1100 Subject: [PATCH 07/40] feat: add pagination to admin post list handler and service Co-Authored-By: Claude Opus 4.6 --- handlers/posts.go | 30 ++++++++++++++++++++++++++---- services/posts/list.go | 25 ++++++++++++++++--------- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/handlers/posts.go b/handlers/posts.go index a133758..3326533 100644 --- a/handlers/posts.go +++ b/handlers/posts.go @@ -6,6 +6,7 @@ import ( "github.com/gofiber/fiber/v3" "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/providers/db" "lmika.dev/lmika/weiro/services/categories" "lmika.dev/lmika/weiro/services/posts" ) @@ -18,22 +19,43 @@ type PostsHandler struct { func (ph PostsHandler) Index(c fiber.Ctx) error { var req struct { Filter string `query:"filter"` + Page int `query:"page"` } if err := c.Bind().Query(&req); err != nil { return fiber.ErrBadRequest } - posts, err := ph.PostService.ListPosts(c.Context(), req.Filter == "deleted") + const perPage = 25 + if req.Page < 1 { + req.Page = 1 + } + + result, err := ph.PostService.ListPosts(c.Context(), req.Filter == "deleted", db.PagingParams{ + Offset: int64((req.Page - 1) * perPage), + Limit: perPage, + }) if err != nil { return err } + totalPages := int(result.TotalCount+int64(perPage)-1) / perPage + if totalPages < 1 { + totalPages = 1 + } + + pageInfo := models.PageInfo{ + CurrentPage: req.Page, + TotalPages: totalPages, + PostsPerPage: perPage, + } + return accepts(c, json(func() any { - return posts + return result.Posts }), html(func(c fiber.Ctx) error { return c.Render("posts/index", fiber.Map{ - "req": req, - "posts": posts, + "req": req, + "posts": result.Posts, + "pageInfo": pageInfo, }) })) } diff --git a/services/posts/list.go b/services/posts/list.go index 15e14d3..dd25bae 100644 --- a/services/posts/list.go +++ b/services/posts/list.go @@ -12,29 +12,36 @@ type PostWithCategories struct { Categories []*models.Category } -func (s *Service) ListPosts(ctx context.Context, showDeleted bool) ([]*PostWithCategories, error) { +type ListPostsResult struct { + Posts []*PostWithCategories + TotalCount int64 +} + +func (s *Service) ListPosts(ctx context.Context, showDeleted bool, paging db.PagingParams) (ListPostsResult, error) { site, ok := models.GetSite(ctx) if !ok { - return nil, models.SiteRequiredError + return ListPostsResult{}, models.SiteRequiredError } - posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted, db.PagingParams{ - Offset: 0, - Limit: 25, - }) + posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted, paging) if err != nil { - return nil, err + return ListPostsResult{}, err + } + + count, err := s.db.CountPostsOfSite(ctx, site.ID, showDeleted) + if err != nil { + return ListPostsResult{}, err } result := make([]*PostWithCategories, len(posts)) for i, post := range posts { cats, err := s.db.SelectCategoriesOfPost(ctx, post.ID) if err != nil { - return nil, err + return ListPostsResult{}, err } result[i] = &PostWithCategories{Post: post, Categories: cats} } - return result, nil + return ListPostsResult{Posts: result, TotalCount: count}, nil } func (s *Service) GetPost(ctx context.Context, pid int64) (*models.Post, error) { From d7a5d425b8361e2b5b2b381f773b5393fa43d7b8 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:34:55 +1100 Subject: [PATCH 08/40] feat: add pagination controls to admin post list Co-Authored-By: Claude Opus 4.6 --- models/paging.go | 9 +++++++++ views/posts/index.html | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/models/paging.go b/models/paging.go index 4ba0c9f..b4e514b 100644 --- a/models/paging.go +++ b/models/paging.go @@ -26,3 +26,12 @@ func (p PageInfo) PreviousPage() int { func (p PageInfo) NextPage() int { return p.CurrentPage + 1 } + +// Pages returns a slice of page numbers for rendering numbered pagination. +func (p PageInfo) Pages() []int { + pages := make([]int, p.TotalPages) + for i := range pages { + pages[i] = i + 1 + } + return pages +} diff --git a/views/posts/index.html b/views/posts/index.html index bbf445d..7786539 100644 --- a/views/posts/index.html +++ b/views/posts/index.html @@ -62,4 +62,22 @@ {{ end }} {{ end }} + + {{ if gt .pageInfo.TotalPages 1 }} + + {{ end }} \ No newline at end of file From 550ebf728aaf4e6439be2da1016ef50abcd10d80 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:35:56 +1100 Subject: [PATCH 09/40] feat: add posts per page setting to site settings Co-Authored-By: Claude Sonnet 4.6 --- services/sites/services.go | 17 +++++++++++++---- views/sitesettings/general.html | 7 +++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/services/sites/services.go b/services/sites/services.go index 06afe15..4c974bb 100644 --- a/services/sites/services.go +++ b/services/sites/services.go @@ -129,10 +129,11 @@ func (s *Service) ListAllSitesWithOwners(ctx context.Context) ([]db.SiteWithOwne } type UpdateSiteSettingsParams struct { - SiteID int64 `form:"siteID"` - Name string `form:"name"` - Tagline string `form:"tagline"` - Timezone string `form:"timezone"` + SiteID int64 `form:"siteID"` + Name string `form:"name"` + Tagline string `form:"tagline"` + Timezone string `form:"timezone"` + PostsPerPage int `form:"postsPerPage"` } func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSettingsParams) (models.Site, error) { @@ -146,9 +147,17 @@ func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSetti return models.Site{}, errors.Wrap(err, "invalid timezone") } + postsPerPage := params.PostsPerPage + if postsPerPage < 1 { + postsPerPage = 1 + } else if postsPerPage > 100 { + postsPerPage = 100 + } + site.Title = params.Name site.Tagline = params.Tagline site.Timezone = params.Timezone + site.PostsPerPage = postsPerPage if err := s.db.SaveSite(ctx, &site); err != nil { return models.Site{}, err diff --git a/views/sitesettings/general.html b/views/sitesettings/general.html index ca3e7a9..6f1833b 100644 --- a/views/sitesettings/general.html +++ b/views/sitesettings/general.html @@ -41,6 +41,13 @@ +
+ +
+ +
Number of posts per page on the generated site.
+
+
From 30884372d6db048c92be996181b1a90dd5066677 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:37:42 +1100 Subject: [PATCH 10/40] feat: add pagination to generated site post list Co-Authored-By: Claude Opus 4.6 --- layouts/simplecss/templates/posts_list.html | 8 ++- providers/sitebuilder/builder.go | 70 ++++++++++++++++++--- providers/sitebuilder/builder_test.go | 1 + providers/sitebuilder/tmpls.go | 5 +- 4 files changed, 74 insertions(+), 10 deletions(-) diff --git a/layouts/simplecss/templates/posts_list.html b/layouts/simplecss/templates/posts_list.html index 5f10f1e..6a2eca6 100644 --- a/layouts/simplecss/templates/posts_list.html +++ b/layouts/simplecss/templates/posts_list.html @@ -5,4 +5,10 @@ {{ template "_post_meta.html" . }}
-{{ end }} \ No newline at end of file +{{ end }} +{{ if or .PrevURL .NextURL }} + +{{ end }} diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index 1a4275d..601db41 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -122,7 +122,8 @@ func (b *Builder) BuildSite(outDir string) error { } func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Context) error { - var posts []postSingleData + // Collect all posts + var allPosts []postSingleData for mp := range b.site.PostIter(ctx) { post, err := mp.Get() if err != nil { @@ -132,17 +133,70 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co if err != nil { return err } - posts = append(posts, rp) + allPosts = append(allPosts, rp) } - pl := postListData{ - commonData: commonData{Site: b.site}, - Posts: posts, + postsPerPage := b.site.PostsPerPage + if postsPerPage < 1 { + postsPerPage = 10 } - return b.createAtPath(bctx, "", func(f io.Writer) error { - return b.renderTemplate(f, tmplNamePostList, pl) - }) + totalPages := (len(allPosts) + postsPerPage - 1) / postsPerPage + if totalPages < 1 { + totalPages = 1 + } + + for page := 1; page <= totalPages; page++ { + start := (page - 1) * postsPerPage + end := start + postsPerPage + if end > len(allPosts) { + end = len(allPosts) + } + + pageInfo := models.PageInfo{ + CurrentPage: page, + TotalPages: totalPages, + PostsPerPage: postsPerPage, + } + + var prevURL, nextURL string + if page > 1 { + if page == 2 { + prevURL = "/posts/" + } else { + prevURL = fmt.Sprintf("/posts/page/%d/", page-1) + } + } + if page < totalPages { + nextURL = fmt.Sprintf("/posts/page/%d/", page+1) + } + + pl := postListData{ + commonData: commonData{Site: b.site}, + Posts: allPosts[start:end], + PageInfo: pageInfo, + PrevURL: prevURL, + NextURL: nextURL, + } + + // Page 1 renders at both root and /posts/ + var paths []string + if page == 1 { + paths = []string{"", "/posts"} + } else { + paths = []string{fmt.Sprintf("/posts/page/%d", page)} + } + + for _, path := range paths { + if err := b.createAtPath(bctx, path, func(f io.Writer) error { + return b.renderTemplate(f, tmplNamePostList, pl) + }); err != nil { + return err + } + } + } + + return nil } func (b *Builder) renderFeeds(ctx buildContext, postIter iter.Seq[models.Maybe[*models.Post]], opts feedOptions) error { diff --git a/providers/sitebuilder/builder_test.go b/providers/sitebuilder/builder_test.go index cbe116b..a5a9bbf 100644 --- a/providers/sitebuilder/builder_test.go +++ b/providers/sitebuilder/builder_test.go @@ -38,6 +38,7 @@ func TestBuilder_BuildSite(t *testing.T) { } site := pubmodel.Site{ + Site: models.Site{PostsPerPage: 10}, BaseURL: "https://example.com", PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] { return func(yield func(models.Maybe[*models.Post]) bool) { diff --git a/providers/sitebuilder/tmpls.go b/providers/sitebuilder/tmpls.go index cea02f5..2ba1c74 100644 --- a/providers/sitebuilder/tmpls.go +++ b/providers/sitebuilder/tmpls.go @@ -61,7 +61,10 @@ type postSingleData struct { type postListData struct { commonData - Posts []postSingleData + Posts []postSingleData + PageInfo models.PageInfo + PrevURL string + NextURL string } type layoutData struct { From f68bac809ffb500765d6f4e81f68edb05bd48e05 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:38:39 +1100 Subject: [PATCH 11/40] feat: add pagination to generated site category pages Co-Authored-By: Claude Opus 4.6 --- .../templates/categories_single.html | 8 +- providers/sitebuilder/builder.go | 75 +++++++++++++++---- providers/sitebuilder/tmpls.go | 3 + 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/layouts/simplecss/templates/categories_single.html b/layouts/simplecss/templates/categories_single.html index deaeb02..e9e7116 100644 --- a/layouts/simplecss/templates/categories_single.html +++ b/layouts/simplecss/templates/categories_single.html @@ -8,4 +8,10 @@ {{ .HTML }} {{ template "_post_meta.html" . }} -{{ end }} \ No newline at end of file +{{ end }} +{{ if or .PrevURL .NextURL }} + +{{ end }} diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index 601db41..f18e00d 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -372,7 +372,8 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e continue } - var posts []postSingleData + // Collect all posts for this category + var allPosts []postSingleData for mp := range b.site.PostIterByCategory(goCtx, cwc.ID) { post, err := mp.Get() if err != nil { @@ -382,7 +383,7 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e if err != nil { return err } - posts = append(posts, rp) + allPosts = append(allPosts, rp) } var descHTML bytes.Buffer @@ -392,22 +393,68 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e } } - data := categorySingleData{ - commonData: commonData{Site: b.site}, - Category: &cwc.Category, - DescriptionHTML: template.HTML(descHTML.String()), - Posts: posts, - Path: fmt.Sprintf("/categories/%s", cwc.Slug), + postsPerPage := b.site.PostsPerPage + if postsPerPage < 1 { + postsPerPage = 10 } - if err := b.createAtPath(ctx, data.Path, func(f io.Writer) error { - return b.renderTemplate(f, tmplNameCategorySingle, data) - }); err != nil { - return err + totalPages := (len(allPosts) + postsPerPage - 1) / postsPerPage + if totalPages < 1 { + totalPages = 1 } - // Per-category feeds - if err := b.renderCategoryFeed(ctx, cwc, posts); err != nil { + basePath := fmt.Sprintf("/categories/%s", cwc.Slug) + + for page := 1; page <= totalPages; page++ { + start := (page - 1) * postsPerPage + end := start + postsPerPage + if end > len(allPosts) { + end = len(allPosts) + } + + pageInfo := models.PageInfo{ + CurrentPage: page, + TotalPages: totalPages, + PostsPerPage: postsPerPage, + } + + var prevURL, nextURL string + if page > 1 { + if page == 2 { + prevURL = basePath + "/" + } else { + prevURL = fmt.Sprintf("%s/page/%d/", basePath, page-1) + } + } + if page < totalPages { + nextURL = fmt.Sprintf("%s/page/%d/", basePath, page+1) + } + + path := basePath + if page > 1 { + path = fmt.Sprintf("%s/page/%d", basePath, page) + } + + data := categorySingleData{ + commonData: commonData{Site: b.site}, + Category: &cwc.Category, + DescriptionHTML: template.HTML(descHTML.String()), + Posts: allPosts[start:end], + Path: path, + PageInfo: pageInfo, + PrevURL: prevURL, + NextURL: nextURL, + } + + if err := b.createAtPath(ctx, path, func(f io.Writer) error { + return b.renderTemplate(f, tmplNameCategorySingle, data) + }); err != nil { + return err + } + } + + // Per-category feeds (use all posts, not paginated) + if err := b.renderCategoryFeed(ctx, cwc, allPosts); err != nil { return err } } diff --git a/providers/sitebuilder/tmpls.go b/providers/sitebuilder/tmpls.go index 2ba1c74..e0ece37 100644 --- a/providers/sitebuilder/tmpls.go +++ b/providers/sitebuilder/tmpls.go @@ -88,4 +88,7 @@ type categorySingleData struct { DescriptionHTML template.HTML Posts []postSingleData Path string + PageInfo models.PageInfo + PrevURL string + NextURL string } From 40da63368a37c9651497c51b3896846dcad195bb Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 14:41:50 +1100 Subject: [PATCH 12/40] fix: add nil guard for StaticFS and set default PostsPerPage in FirstRun Co-Authored-By: Claude Opus 4.6 --- providers/sitebuilder/builder.go | 3 +++ services/sites/services.go | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index f18e00d..7523d13 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -572,6 +572,9 @@ func (b *Builder) writeUploads(ctx buildContext, uploads []models.Upload) error } func (b *Builder) writeStaticAssets(ctx buildContext) error { + if b.opts.StaticFS == nil { + return nil + } return fs.WalkDir(b.opts.StaticFS, ".", func(path string, d os.DirEntry, err error) error { if err != nil { return err diff --git a/services/sites/services.go b/services/sites/services.go index 4c974bb..86e34b2 100644 --- a/services/sites/services.go +++ b/services/sites/services.go @@ -77,11 +77,12 @@ func (s *Service) FirstRun(ctx context.Context, req FirstRunRequest) (newUser mo } newSite = models.Site{ - Title: defaultIfEmpty(req.SiteName, "New Site"), - GUID: models.NewNanoID(), - OwnerID: newUser.ID, - Timezone: "UTC", - Created: time.Now(), + Title: defaultIfEmpty(req.SiteName, "New Site"), + GUID: models.NewNanoID(), + OwnerID: newUser.ID, + Timezone: "UTC", + PostsPerPage: 10, + Created: time.Now(), } if err := s.db.SaveSite(ctx, &newSite); err != nil { return newUser, newSite, err From 0a1631a7e0beef2e3680605fa9dfaf28c9633372 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 16:22:32 +1100 Subject: [PATCH 13/40] Fixed paging URL --- providers/sitebuilder/builder.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index 7523d13..9e5199d 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -164,11 +164,11 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co if page == 2 { prevURL = "/posts/" } else { - prevURL = fmt.Sprintf("/posts/page/%d/", page-1) + prevURL = fmt.Sprintf("/posts/%d/", page-1) } } if page < totalPages { - nextURL = fmt.Sprintf("/posts/page/%d/", page+1) + nextURL = fmt.Sprintf("/posts/%d/", page+1) } pl := postListData{ @@ -184,7 +184,7 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co if page == 1 { paths = []string{"", "/posts"} } else { - paths = []string{fmt.Sprintf("/posts/page/%d", page)} + paths = []string{fmt.Sprintf("/posts/%d", page)} } for _, path := range paths { @@ -423,16 +423,16 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e if page == 2 { prevURL = basePath + "/" } else { - prevURL = fmt.Sprintf("%s/page/%d/", basePath, page-1) + prevURL = fmt.Sprintf("%s/%d/", basePath, page-1) } } if page < totalPages { - nextURL = fmt.Sprintf("%s/page/%d/", basePath, page+1) + nextURL = fmt.Sprintf("%s/%d/", basePath, page+1) } path := basePath if page > 1 { - path = fmt.Sprintf("%s/page/%d", basePath, page) + path = fmt.Sprintf("%s/%d", basePath, page) } data := categorySingleData{ From a00567a756e191a63d6a8fc8a02de9ca73991546 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 16:37:47 +1100 Subject: [PATCH 14/40] Add arbitrary pages feature design spec Co-Authored-By: Claude Opus 4.6 --- .../specs/2026-03-22-pages-design.md | 148 ++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 docs/superpowers/specs/2026-03-22-pages-design.md diff --git a/docs/superpowers/specs/2026-03-22-pages-design.md b/docs/superpowers/specs/2026-03-22-pages-design.md new file mode 100644 index 0000000..cc17417 --- /dev/null +++ b/docs/superpowers/specs/2026-03-22-pages-design.md @@ -0,0 +1,148 @@ +# Arbitrary Pages Feature Design + +## Overview + +Allow users to create arbitrary pages for their site. Each page has a title, user-editable slug, markdown body, page type, nav visibility flag, and sort order. Pages are a separate entity from posts with their own admin section and generated site template. Pages rendered at conflicting slugs silently override auto-generated content. + +## Data Layer + +### New `pages` table + +```sql +CREATE TABLE pages ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + site_id INTEGER NOT NULL, + guid TEXT NOT NULL, + title TEXT NOT NULL, + slug TEXT NOT NULL, + body TEXT NOT NULL, + page_type INTEGER NOT NULL DEFAULT 0, + show_in_nav INTEGER NOT NULL DEFAULT 0, + sort_order INTEGER NOT NULL DEFAULT 0, + created_at INTEGER NOT NULL, + updated_at INTEGER NOT NULL, + FOREIGN KEY (site_id) REFERENCES sites (id) ON DELETE CASCADE +); +CREATE INDEX idx_pages_site ON pages (site_id); +CREATE UNIQUE INDEX idx_pages_guid ON pages (guid); +CREATE UNIQUE INDEX idx_pages_site_slug ON pages (site_id, slug); +``` + +### Model + +```go +type Page struct { + ID int64 + SiteID int64 + GUID string + Title string + Slug string + Body string + PageType int + ShowInNav bool + SortOrder int + CreatedAt time.Time + UpdatedAt time.Time +} +``` + +Page type constants: `PageTypeNormal = 0` (extensible later for archive, search, etc.). + +### SQL queries + +- `SelectPagesOfSite(siteID)` — all pages for a site, ordered by `sort_order ASC` +- `SelectPage(id)` — single page by ID +- `SelectPageByGUID(guid)` — single page by GUID +- `InsertPage` — create new page, returns ID +- `UpdatePage` — update page fields +- `DeletePage(id)` — delete page +- `UpdatePageSortOrder(id, sortOrder)` — update sort order for a single page + +## Admin Section + +### Navigation + +Add "Pages" item to the admin nav bar (`views/_common/nav.html`), linking to `/sites/:siteID/pages`. + +### Routes + +``` +GET /sites/:siteID/pages - List pages +GET /sites/:siteID/pages/new - New page form +GET /sites/:siteID/pages/:pageID - Edit page form +POST /sites/:siteID/pages - Create/update page +DELETE /sites/:siteID/pages/:pageID - Delete page +POST /sites/:siteID/pages/reorder - Update sort order (AJAX) +``` + +### Page list view (`views/pages/index.html`) + +- Lists pages ordered by `sort_order` +- Each row shows title, slug, and nav visibility indicator +- Drag-and-drop reordering via Stimulus + HTML drag API +- On drop, sends new order to `POST /pages/reorder` via AJAX +- "New Page" button + +### Page edit form (`views/pages/edit.html`) + +Two-column layout mirroring the post edit form: + +**Main area (left):** +- Title input +- Body textarea (markdown) + +**Sidebar (right):** +- Slug (editable text input, auto-derived from title via client-side JS, user can override) +- Page Type (select dropdown, just "Normal" for now) +- Show in Nav (checkbox) + +Save button below. + +### Service layer (`services/pages/`) + +- `Service` struct with DB provider dependency +- `CreatePage(ctx, params)` — generates GUID, derives slug from title if not provided, sets timestamps +- `UpdatePage(ctx, params)` — updates fields, sets `updated_at` +- `DeletePage(ctx, pageID)` — deletes page +- `ListPages(ctx)` — returns all pages for the site from context, ordered by `sort_order` +- `GetPage(ctx, pageID)` — returns single page +- `ReorderPages(ctx, pageIDs []int64)` — accepts ordered list of page IDs, updates `sort_order` for each (sort_order = index in list) + +### Handler (`handlers/pages.go`) + +- `PagesHandler` struct with `PageService` +- Standard CRUD handlers following the existing posts handler pattern +- `Reorder` handler accepts JSON array of page IDs, calls `ReorderPages` + +## Generated Site + +### Template + +New template `pages_single.html` — receives rendered page HTML, rendered inside `layout_main.html` (same wrapping as posts). + +Template data: +```go +type pageSingleData struct { + commonData + Page *models.Page + HTML template.HTML +} +``` + +### Builder changes + +New method `renderPages` on the builder: +- Iterates all pages from `pubmodel.Site.Pages` +- For each page, renders markdown body and writes to the page's slug path using `createAtPath` +- Pages are rendered **after** all other content (posts, post lists, categories, feeds, uploads, static assets) +- This ensures pages at conflicting slugs silently overwrite auto-generated content +- Implementation: `renderPages` runs as a sequential step after `eg.Wait()` returns in `BuildSite` + +### Publisher changes + +- `pubmodel.Site` gets a new `Pages []models.Page` field +- The publisher fetches all pages for the site via `SelectPagesOfSite` and populates this field + +## Approach + +Pages are a separate entity from posts with their own table, service, handler, and templates. The override mechanism is file-system-based: the site builder renders pages last, so any page slug that conflicts with an auto-generated path wins by overwriting the file. The `show_in_nav` field is stored and editable in admin but not yet consumed by the generated site layout — that integration is deferred for a future change. From 620ab6c6fa68c936679eb9d83f883a7dea93a613 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 17:47:19 +1100 Subject: [PATCH 15/40] docs: add pages feature implementation plan Co-Authored-By: Claude Opus 4.6 --- docs/superpowers/plans/2026-03-22-pages.md | 1218 ++++++++++++++++++++ 1 file changed, 1218 insertions(+) create mode 100644 docs/superpowers/plans/2026-03-22-pages.md diff --git a/docs/superpowers/plans/2026-03-22-pages.md b/docs/superpowers/plans/2026-03-22-pages.md new file mode 100644 index 0000000..89a3983 --- /dev/null +++ b/docs/superpowers/plans/2026-03-22-pages.md @@ -0,0 +1,1218 @@ +# Arbitrary Pages Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Allow users to create arbitrary pages with title, slug, markdown body, page type, nav visibility, and sort order, rendered on the generated site. + +**Architecture:** New `pages` table + model + service + handler + admin views following the existing categories pattern. Publisher populates `pubmodel.Site.Pages`, and the site builder renders pages **after** all other content so conflicting slugs silently override auto-generated files. Drag-and-drop reordering in admin via a new Stimulus controller. + +**Tech Stack:** Go/Fiber v3, SQLite/sqlc, Bootstrap 5, Stimulus.js, goldmark markdown, html/template + +--- + +## File Structure + +**New files:** +- `sql/schema/06_pages.up.sql` - Migration for pages table +- `sql/queries/pages.sql` - sqlc queries for pages +- `models/pages.go` - Page model struct and slug helper +- `providers/db/pages.go` - DB provider methods for pages +- `services/pages/service.go` - Pages service layer +- `handlers/pages.go` - Admin pages handler +- `views/pages/index.html` - Admin page list with drag-and-drop +- `views/pages/edit.html` - Admin page edit form (two-column) +- `assets/js/controllers/pagelist.js` - Stimulus controller for drag-and-drop reorder +- `layouts/simplecss/templates/pages_single.html` - Generated site page template +- `providers/sitebuilder/render_pages.go` - Builder renderPages method + +**Modified files:** +- `providers/db/gen/sqlgen/` - Regenerated sqlc output +- `models/pubmodel/sites.go` - Add `Pages []models.Page` field +- `services/publisher/service.go` - Fetch pages and populate pubmodel +- `providers/sitebuilder/tmpls.go` - Add pageSingleData type and template constant +- `providers/sitebuilder/builder.go` - Call renderPages after eg.Wait() +- `providers/sitebuilder/builder_test.go` - Add pages to test +- `views/_common/nav.html` - Add "Pages" nav item +- `services/services.go` - Wire up pages service +- `cmds/server.go` - Wire up pages handler and routes +- `assets/js/main.js` - Register pagelist controller +- `esbuild.mjs` - No change needed (auto-picks up new JS files) + +--- + +### Task 1: Schema Migration and sqlc Queries + +**Files:** +- Create: `sql/schema/06_pages.up.sql` +- Create: `sql/queries/pages.sql` +- Regenerate: `providers/db/gen/sqlgen/` + +- [ ] **Step 1: Write the schema migration** + +```sql +-- sql/schema/06_pages.up.sql +CREATE TABLE pages ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + site_id INTEGER NOT NULL, + guid TEXT NOT NULL, + title TEXT NOT NULL, + slug TEXT NOT NULL, + body TEXT NOT NULL, + page_type INTEGER NOT NULL DEFAULT 0, + show_in_nav INTEGER NOT NULL DEFAULT 0, + sort_order INTEGER NOT NULL DEFAULT 0, + created_at INTEGER NOT NULL, + updated_at INTEGER NOT NULL, + FOREIGN KEY (site_id) REFERENCES sites (id) ON DELETE CASCADE +); +CREATE INDEX idx_pages_site ON pages (site_id); +CREATE UNIQUE INDEX idx_pages_guid ON pages (guid); +CREATE UNIQUE INDEX idx_pages_site_slug ON pages (site_id, slug); +``` + +- [ ] **Step 2: Write the sqlc queries** + +```sql +-- sql/queries/pages.sql + +-- name: SelectPagesOfSite :many +SELECT * FROM pages +WHERE site_id = ? ORDER BY sort_order ASC; + +-- name: SelectPage :one +SELECT * FROM pages WHERE id = ? LIMIT 1; + +-- name: SelectPageByGUID :one +SELECT * FROM pages WHERE guid = ? LIMIT 1; + +-- name: SelectPageBySlugAndSite :one +SELECT * FROM pages WHERE site_id = ? AND slug = ? LIMIT 1; + +-- name: InsertPage :one +INSERT INTO pages ( + site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at +) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) +RETURNING id; + +-- name: UpdatePage :exec +UPDATE pages SET + title = ?, + slug = ?, + body = ?, + page_type = ?, + show_in_nav = ?, + updated_at = ? +WHERE id = ?; + +-- name: UpdatePageSortOrder :exec +UPDATE pages SET sort_order = ? WHERE id = ?; + +-- name: DeletePage :exec +DELETE FROM pages WHERE id = ?; +``` + +- [ ] **Step 3: Regenerate sqlc** + +Run: `sqlc generate` +Expected: Clean generation, new files in `providers/db/gen/sqlgen/` for pages queries. + +- [ ] **Step 4: Commit** + +```bash +git add sql/ providers/db/gen/ +git commit -m "feat(pages): add pages table schema and sqlc queries" +``` + +--- + +### Task 2: Page Model + +**Files:** +- Create: `models/pages.go` + +- [ ] **Step 1: Write the Page model and constants** + +```go +// models/pages.go +package models + +import ( + "strings" + "time" + "unicode" +) + +const ( + PageTypeNormal = 0 +) + +type Page struct { + ID int64 `json:"id"` + SiteID int64 `json:"site_id"` + GUID string `json:"guid"` + Title string `json:"title"` + Slug string `json:"slug"` + Body string `json:"body"` + PageType int `json:"page_type"` + ShowInNav bool `json:"show_in_nav"` + SortOrder int `json:"sort_order"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} + +// GeneratePageSlug creates a URL-safe slug from a page title. +// e.g. "About Me" -> "about-me" +func GeneratePageSlug(title string) string { + var sb strings.Builder + prevDash := false + for _, c := range strings.TrimSpace(title) { + if unicode.IsLetter(c) || unicode.IsNumber(c) { + sb.WriteRune(unicode.ToLower(c)) + prevDash = false + } else if unicode.IsSpace(c) || c == '-' || c == '_' { + if !prevDash && sb.Len() > 0 { + sb.WriteRune('-') + prevDash = true + } + } + } + result := sb.String() + return strings.TrimRight(result, "-") +} +``` + +- [ ] **Step 2: Write a test for GeneratePageSlug** + +```go +// models/pages_test.go +package models_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "lmika.dev/lmika/weiro/models" +) + +func TestGeneratePageSlug(t *testing.T) { + tests := []struct { + title string + want string + }{ + {"About Me", "about-me"}, + {" Contact Us ", "contact-us"}, + {"Hello---World", "hello-world"}, + {"FAQ", "faq"}, + {"", ""}, + } + for _, tt := range tests { + t.Run(tt.title, func(t *testing.T) { + assert.Equal(t, tt.want, models.GeneratePageSlug(tt.title)) + }) + } +} +``` + +- [ ] **Step 3: Run tests** + +Run: `go test ./models/ -run TestGeneratePageSlug -v` +Expected: PASS + +- [ ] **Step 4: Commit** + +```bash +git add models/pages.go models/pages_test.go +git commit -m "feat(pages): add Page model and slug generator" +``` + +--- + +### Task 3: DB Provider for Pages + +**Files:** +- Create: `providers/db/pages.go` + +- [ ] **Step 1: Write the DB provider methods** + +Follow the pattern from `providers/db/categories.go`. The conversion function maps sqlgen types to model types. `ShowInNav` maps from `int64` (0/1) to `bool`. Timestamps map via `time.Unix(row.CreatedAt, 0).UTC()`. + +```go +// providers/db/pages.go +package db + +import ( + "context" + "time" + + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/providers/db/gen/sqlgen" +) + +func (db *Provider) SelectPagesOfSite(ctx context.Context, siteID int64) ([]*models.Page, error) { + rows, err := db.queries.SelectPagesOfSite(ctx, siteID) + if err != nil { + return nil, err + } + pages := make([]*models.Page, len(rows)) + for i, row := range rows { + pages[i] = dbPageToPage(row) + } + return pages, nil +} + +func (db *Provider) SelectPage(ctx context.Context, id int64) (*models.Page, error) { + row, err := db.queries.SelectPage(ctx, id) + if err != nil { + return nil, err + } + return dbPageToPage(row), nil +} + +func (db *Provider) SelectPageByGUID(ctx context.Context, guid string) (*models.Page, error) { + row, err := db.queries.SelectPageByGUID(ctx, guid) + if err != nil { + return nil, err + } + return dbPageToPage(row), nil +} + +func (db *Provider) SelectPageBySlugAndSite(ctx context.Context, siteID int64, slug string) (*models.Page, error) { + row, err := db.queries.SelectPageBySlugAndSite(ctx, sqlgen.SelectPageBySlugAndSiteParams{ + SiteID: siteID, + Slug: slug, + }) + if err != nil { + return nil, err + } + return dbPageToPage(row), nil +} + +func (db *Provider) SavePage(ctx context.Context, page *models.Page) error { + if page.ID == 0 { + showInNav := int64(0) + if page.ShowInNav { + showInNav = 1 + } + newID, err := db.queries.InsertPage(ctx, sqlgen.InsertPageParams{ + SiteID: page.SiteID, + Guid: page.GUID, + Title: page.Title, + Slug: page.Slug, + Body: page.Body, + PageType: int64(page.PageType), + ShowInNav: showInNav, + SortOrder: int64(page.SortOrder), + CreatedAt: timeToInt(page.CreatedAt), + UpdatedAt: timeToInt(page.UpdatedAt), + }) + if err != nil { + return err + } + page.ID = newID + return nil + } + + showInNav := int64(0) + if page.ShowInNav { + showInNav = 1 + } + return db.queries.UpdatePage(ctx, sqlgen.UpdatePageParams{ + Title: page.Title, + Slug: page.Slug, + Body: page.Body, + PageType: int64(page.PageType), + ShowInNav: showInNav, + UpdatedAt: timeToInt(page.UpdatedAt), + ID: page.ID, + }) +} + +func (db *Provider) UpdatePageSortOrder(ctx context.Context, id int64, sortOrder int) error { + return db.queries.UpdatePageSortOrder(ctx, sqlgen.UpdatePageSortOrderParams{ + SortOrder: int64(sortOrder), + ID: id, + }) +} + +func (db *Provider) DeletePage(ctx context.Context, id int64) error { + return db.queries.DeletePage(ctx, id) +} + +func dbPageToPage(row sqlgen.Page) *models.Page { + return &models.Page{ + ID: row.ID, + SiteID: row.SiteID, + GUID: row.Guid, + Title: row.Title, + Slug: row.Slug, + Body: row.Body, + PageType: int(row.PageType), + ShowInNav: row.ShowInNav != 0, + SortOrder: int(row.SortOrder), + CreatedAt: time.Unix(row.CreatedAt, 0).UTC(), + UpdatedAt: time.Unix(row.UpdatedAt, 0).UTC(), + } +} +``` + +**Important:** The exact field names on `sqlgen.InsertPageParams`, `sqlgen.UpdatePageParams`, etc. depend on what sqlc generates. Check the generated code in `providers/db/gen/sqlgen/pages.sql.go` to confirm field names and types before writing this file. Adjust as needed. + +- [ ] **Step 2: Verify it compiles** + +Run: `go build ./providers/db/...` +Expected: Clean compile + +- [ ] **Step 3: Commit** + +```bash +git add providers/db/pages.go +git commit -m "feat(pages): add DB provider methods for pages" +``` + +--- + +### Task 4: Pages Service + +**Files:** +- Create: `services/pages/service.go` +- Modify: `services/services.go` + +- [ ] **Step 1: Write the pages service** + +Follow the pattern from `services/categories/service.go`. The service gets site from context, validates ownership, generates slugs, and queues republish on mutations. + +```go +// services/pages/service.go +package pages + +import ( + "context" + "time" + + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/providers/db" + "lmika.dev/lmika/weiro/services/publisher" +) + +type CreatePageParams struct { + GUID string `form:"guid" json:"guid"` + Title string `form:"title" json:"title"` + Slug string `form:"slug" json:"slug"` + Body string `form:"body" json:"body"` + PageType int `form:"page_type" json:"page_type"` + ShowInNav bool `form:"show_in_nav" json:"show_in_nav"` +} + +type Service struct { + db *db.Provider + publisher *publisher.Queue +} + +func New(db *db.Provider, publisher *publisher.Queue) *Service { + return &Service{db: db, publisher: publisher} +} + +func (s *Service) ListPages(ctx context.Context) ([]*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + return s.db.SelectPagesOfSite(ctx, site.ID) +} + +func (s *Service) GetPage(ctx context.Context, id int64) (*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return nil, err + } + if page.SiteID != site.ID { + return nil, models.NotFoundError + } + return page, nil +} + +func (s *Service) CreatePage(ctx context.Context, params CreatePageParams) (*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + + now := time.Now() + slug := params.Slug + if slug == "" { + slug = models.GeneratePageSlug(params.Title) + } + + // Check slug collision + if _, err := s.db.SelectPageBySlugAndSite(ctx, site.ID, slug); err == nil { + return nil, models.SlugConflictError + } else if !db.ErrorIsNoRows(err) { + return nil, err + } + + // Determine sort order: place at end + existingPages, err := s.db.SelectPagesOfSite(ctx, site.ID) + if err != nil { + return nil, err + } + sortOrder := len(existingPages) + + page := &models.Page{ + SiteID: site.ID, + GUID: params.GUID, + Title: params.Title, + Slug: slug, + Body: params.Body, + PageType: params.PageType, + ShowInNav: params.ShowInNav, + SortOrder: sortOrder, + CreatedAt: now, + UpdatedAt: now, + } + if page.GUID == "" { + page.GUID = models.NewNanoID() + } + + if err := s.db.SavePage(ctx, page); err != nil { + return nil, err + } + + s.publisher.Queue(site) + return page, nil +} + +func (s *Service) UpdatePage(ctx context.Context, id int64, params CreatePageParams) (*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return nil, err + } + if page.SiteID != site.ID { + return nil, models.NotFoundError + } + + slug := params.Slug + if slug == "" { + slug = models.GeneratePageSlug(params.Title) + } + + // Check slug collision (exclude self) + if existing, err := s.db.SelectPageBySlugAndSite(ctx, site.ID, slug); err == nil && existing.ID != page.ID { + return nil, models.SlugConflictError + } else if err != nil && !db.ErrorIsNoRows(err) { + return nil, err + } + + page.Title = params.Title + page.Slug = slug + page.Body = params.Body + page.PageType = params.PageType + page.ShowInNav = params.ShowInNav + page.UpdatedAt = time.Now() + + if err := s.db.SavePage(ctx, page); err != nil { + return nil, err + } + + s.publisher.Queue(site) + return page, nil +} + +func (s *Service) DeletePage(ctx context.Context, id int64) error { + site, ok := models.GetSite(ctx) + if !ok { + return models.SiteRequiredError + } + + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return err + } + if page.SiteID != site.ID { + return models.NotFoundError + } + + if err := s.db.DeletePage(ctx, id); err != nil { + return err + } + + s.publisher.Queue(site) + return nil +} + +func (s *Service) ReorderPages(ctx context.Context, pageIDs []int64) error { + site, ok := models.GetSite(ctx) + if !ok { + return models.SiteRequiredError + } + + // Verify all pages belong to this site + for i, id := range pageIDs { + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return err + } + if page.SiteID != site.ID { + return models.NotFoundError + } + if err := s.db.UpdatePageSortOrder(ctx, id, i); err != nil { + return err + } + } + + s.publisher.Queue(site) + return nil +} +``` + +- [ ] **Step 2: Make SlugConflictError generic** + +In `models/errors.go`, change: +```go +var SlugConflictError = errors.New("a category with this slug already exists") +``` +To: +```go +var SlugConflictError = errors.New("a record with this slug already exists") +``` + +- [ ] **Step 3: Wire up the service in services/services.go** + +Add to the `Services` struct: +```go +Pages *pages.Service +``` + +Add to `New()`: +```go +pagesService := pages.New(dbp, publisherQueue) +``` + +And include in the return struct: +```go +Pages: pagesService, +``` + +Add import: `"lmika.dev/lmika/weiro/services/pages"` + +- [ ] **Step 4: Verify it compiles** + +Run: `go build ./services/...` +Expected: Clean compile + +- [ ] **Step 5: Commit** + +```bash +git add services/pages/ services/services.go models/errors.go +git commit -m "feat(pages): add pages service layer" +``` + +--- + +### Task 5: Pages Handler and Routes + +**Files:** +- Create: `handlers/pages.go` +- Modify: `cmds/server.go` + +- [ ] **Step 1: Write the pages handler** + +Follow the pattern from `handlers/categories.go` for CRUD, plus a `Reorder` handler that accepts JSON. + +```go +// handlers/pages.go +package handlers + +import ( + "fmt" + "strconv" + + "github.com/gofiber/fiber/v3" + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/services/pages" +) + +type PagesHandler struct { + PageService *pages.Service +} + +func (ph PagesHandler) Index(c fiber.Ctx) error { + pagesList, err := ph.PageService.ListPages(c.Context()) + if err != nil { + return err + } + + return c.Render("pages/index", fiber.Map{ + "pages": pagesList, + }) +} + +func (ph PagesHandler) New(c fiber.Ctx) error { + page := models.Page{ + GUID: models.NewNanoID(), + } + return c.Render("pages/edit", fiber.Map{ + "page": page, + "isNew": true, + "bodyClass": "page-edit-page", + }) +} + +func (ph PagesHandler) Edit(c fiber.Ctx) error { + pageID, err := strconv.ParseInt(c.Params("pageID"), 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + page, err := ph.PageService.GetPage(c.Context(), pageID) + if err != nil { + return err + } + + return c.Render("pages/edit", fiber.Map{ + "page": page, + "isNew": false, + "bodyClass": "page-edit-page", + }) +} + +func (ph PagesHandler) Create(c fiber.Ctx) error { + var req pages.CreatePageParams + if err := c.Bind().Body(&req); err != nil { + return err + } + + _, err := ph.PageService.CreatePage(c.Context(), req) + if err != nil { + return err + } + + site := models.MustGetSite(c.Context()) + return c.Redirect().To(fmt.Sprintf("/sites/%v/pages", site.ID)) +} + +func (ph PagesHandler) Update(c fiber.Ctx) error { + pageID, err := strconv.ParseInt(c.Params("pageID"), 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + var req pages.CreatePageParams + if err := c.Bind().Body(&req); err != nil { + return err + } + + _, err = ph.PageService.UpdatePage(c.Context(), pageID, req) + if err != nil { + return err + } + + site := models.MustGetSite(c.Context()) + return c.Redirect().To(fmt.Sprintf("/sites/%v/pages", site.ID)) +} + +func (ph PagesHandler) Delete(c fiber.Ctx) error { + pageID, err := strconv.ParseInt(c.Params("pageID"), 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + if err := ph.PageService.DeletePage(c.Context(), pageID); err != nil { + return err + } + + site := models.MustGetSite(c.Context()) + return c.Redirect().To(fmt.Sprintf("/sites/%v/pages", site.ID)) +} + +func (ph PagesHandler) Reorder(c fiber.Ctx) error { + var req struct { + PageIDs []int64 `json:"page_ids"` + } + if err := c.Bind().Body(&req); err != nil { + return err + } + + if err := ph.PageService.ReorderPages(c.Context(), req.PageIDs); err != nil { + return err + } + + return c.JSON(fiber.Map{"ok": true}) +} +``` + +- [ ] **Step 2: Register routes in cmds/server.go** + +After the categories route block (~line 150), add: + +```go +pgh := handlers.PagesHandler{PageService: svcs.Pages} +``` + +And routes on `siteGroup`: + +```go +siteGroup.Get("/pages", pgh.Index) +siteGroup.Get("/pages/new", pgh.New) +siteGroup.Get("/pages/:pageID", pgh.Edit) +siteGroup.Post("/pages", pgh.Create) +siteGroup.Post("/pages/reorder", pgh.Reorder) +siteGroup.Post("/pages/:pageID", pgh.Update) +siteGroup.Post("/pages/:pageID/delete", pgh.Delete) +``` + +Add import: `// already imported via handlers package` + +- [ ] **Step 3: Verify it compiles** + +Run: `go build ./...` +Expected: Clean compile + +- [ ] **Step 4: Commit** + +```bash +git add handlers/pages.go cmds/server.go +git commit -m "feat(pages): add pages handler and admin routes" +``` + +--- + +### Task 6: Admin Views - Page List with Drag-and-Drop + +**Files:** +- Create: `views/pages/index.html` +- Create: `assets/js/controllers/pagelist.js` +- Modify: `assets/js/main.js` +- Modify: `views/_common/nav.html` + +- [ ] **Step 1: Add "Pages" to the admin nav bar** + +In `views/_common/nav.html`, add a new `
  • ` after the Categories nav item (after line 14): + +```html +
  • + Pages +
    • +``` + +- [ ] **Step 2: Write the page list view** + +```html + +
    +
    +
    + New Page +
    +
    + + {{ if .pages }} + + + + + + + + + + + {{ range .pages }} + + + + + + + {{ end }} + +
    TitleSlugNav
    ☰{{ .Title }}{{ .Slug }}{{ if .ShowInNav }}Yes{{ end }}
    + {{ else }} +
    +
    No pages yet.
    +
    + {{ end }} +
    +``` + +- [ ] **Step 3: Write the pagelist Stimulus controller** + +```javascript +// assets/js/controllers/pagelist.js +import { Controller } from "@hotwired/stimulus" +import { showToast } from "../services/toast"; + +export default class PagelistController extends Controller { + static values = { + siteId: Number, + }; + + static targets = ["list"]; + + dragStart(ev) { + this.draggedRow = ev.currentTarget; + ev.currentTarget.classList.add("opacity-50"); + ev.dataTransfer.effectAllowed = "move"; + } + + dragOver(ev) { + ev.preventDefault(); + ev.dataTransfer.dropEffect = "move"; + } + + drop(ev) { + ev.preventDefault(); + const targetRow = ev.currentTarget; + if (this.draggedRow && this.draggedRow !== targetRow) { + const rows = [...this.listTarget.children]; + const draggedIdx = rows.indexOf(this.draggedRow); + const targetIdx = rows.indexOf(targetRow); + if (draggedIdx < targetIdx) { + targetRow.after(this.draggedRow); + } else { + targetRow.before(this.draggedRow); + } + this.saveOrder(); + } + } + + dragEnd(ev) { + ev.currentTarget.classList.remove("opacity-50"); + this.draggedRow = null; + } + + async saveOrder() { + const rows = [...this.listTarget.children]; + const pageIds = rows.map(row => parseInt(row.dataset.pageId, 10)); + + try { + await fetch(`/sites/${this.siteIdValue}/pages/reorder`, { + method: "POST", + headers: { + "Content-Type": "application/json", + "Accept": "application/json", + }, + body: JSON.stringify({ page_ids: pageIds }), + }); + } catch (error) { + showToast({ + title: "Error", + body: "Failed to reorder pages.", + }); + } + } +} +``` + +- [ ] **Step 4: Register the controller in main.js** + +Add to `assets/js/main.js`: + +```javascript +import PagelistController from "./controllers/pagelist"; +``` + +And register: + +```javascript +Stimulus.register("pagelist", PagelistController); +``` + +- [ ] **Step 5: Rebuild JS bundle** + +Run: `node esbuild.mjs` +Expected: Clean build, `static/assets/main.js` updated. + +- [ ] **Step 6: Commit** + +```bash +git add views/pages/index.html views/_common/nav.html assets/js/controllers/pagelist.js assets/js/main.js static/assets/main.js +git commit -m "feat(pages): add admin page list with drag-and-drop reorder" +``` + +--- + +### Task 7: Admin Views - Page Edit Form + +**Files:** +- Create: `views/pages/edit.html` + +- [ ] **Step 1: Write the page edit form** + +Two-column layout mirroring the post edit form: title + body on left, slug/page type/show in nav on right sidebar. + +```html + +
    + {{ if .isNew }} +
    + {{ else }} + + {{ end }} + +
    +
    +
    + +
    +
    + +
    +
    + + {{ if not .isNew }} + + {{ end }} +
    +
    +
    +
    +
    Page Settings
    +
    +
    + + +
    Auto-generated from title if left blank.
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    + + {{ if not .isNew }} + + {{ end }} +
    +``` + +- [ ] **Step 2: Verify the app compiles and starts** + +Run: `go build ./...` +Expected: Clean compile. + +- [ ] **Step 3: Commit** + +```bash +git add views/pages/edit.html +git commit -m "feat(pages): add admin page edit form with sidebar" +``` + +--- + +### Task 8: Publisher and pubmodel Changes + +**Files:** +- Modify: `models/pubmodel/sites.go` +- Modify: `services/publisher/service.go` + +- [ ] **Step 1: Add Pages field to pubmodel.Site** + +In `models/pubmodel/sites.go`, add to the `Site` struct: + +```go +Pages []*models.Page +``` + +- [ ] **Step 2: Populate pages in the publisher** + +In `services/publisher/service.go`, in the `Publish` method, after fetching categories (~line 66), add: + +```go +// Fetch pages +sitePages, err := p.db.SelectPagesOfSite(ctx, site.ID) +if err != nil { + return err +} +``` + +Then in the `pubSite` construction (~line 73), add the `Pages` field: + +```go +Pages: sitePages, +``` + +- [ ] **Step 3: Verify it compiles** + +Run: `go build ./...` +Expected: Clean compile. + +- [ ] **Step 4: Commit** + +```bash +git add models/pubmodel/sites.go services/publisher/service.go +git commit -m "feat(pages): populate pages in publisher for site generation" +``` + +--- + +### Task 9: Site Builder - Render Pages + +**Files:** +- Create: `providers/sitebuilder/render_pages.go` +- Modify: `providers/sitebuilder/tmpls.go` +- Modify: `providers/sitebuilder/builder.go` +- Create: `layouts/simplecss/templates/pages_single.html` +- Modify: `providers/sitebuilder/builder_test.go` + +- [ ] **Step 1: Add template types and constant** + +In `providers/sitebuilder/tmpls.go`, add the template name constant: + +```go +// tmplNamePageSingle is the template for a single page (pageSingleData) +tmplNamePageSingle = "pages_single.html" +``` + +And the data struct: + +```go +type pageSingleData struct { + commonData + Page *models.Page + HTML template.HTML +} +``` + +- [ ] **Step 2: Create the renderPages method** + +```go +// providers/sitebuilder/render_pages.go +package sitebuilder + +import ( + "bytes" + "context" + "html/template" + "io" + + "lmika.dev/lmika/weiro/models" +) + +func (b *Builder) renderPages(bctx buildContext) error { + for _, page := range b.site.Pages { + + var md bytes.Buffer + if err := b.mdRenderer.RenderTo(context.Background(), &md, page.Body); err != nil { + return err + } + + data := pageSingleData{ + commonData: commonData{Site: b.site}, + Page: page, + HTML: template.HTML(md.String()), + } + + path := "/" + page.Slug + if err := b.createAtPath(bctx, path, func(f io.Writer) error { + return b.renderTemplate(f, tmplNamePageSingle, data) + }); err != nil { + return err + } + } + return nil +} +``` + +- [ ] **Step 3: Call renderPages after eg.Wait() in BuildSite** + +In `providers/sitebuilder/builder.go`, modify the `BuildSite` method. Replace: + +```go +return eg.Wait() +``` + +With: + +```go +if err := eg.Wait(); err != nil { + return err +} + +// Render pages last so they can override auto-generated content +return b.renderPages(buildCtx) +``` + +- [ ] **Step 4: Create the generated site template** + +```html + +{{ if .Page.Title }}

    {{ .Page.Title }}

    {{ end }} +{{ .HTML }} +``` + +- [ ] **Step 5: Add pages to the builder test** + +In `providers/sitebuilder/builder_test.go`, add `"pages_single.html"` to the `tmpls` MapFS: + +```go +"pages_single.html": {Data: []byte(`{{ if .Page.Title }}

    {{ .Page.Title }}

    {{ end }}{{ .HTML }}`)}, +``` + +Add pages to the `site` struct: + +```go +Pages: []*models.Page{ + {Title: "About", Slug: "about", Body: "About this site"}, +}, +``` + +Add to `wantFiles`: + +```go +"about/index.html": "

    About

    About this site

    \n", +``` + +- [ ] **Step 6: Run the builder test** + +Run: `go test ./providers/sitebuilder/ -v` +Expected: PASS + +- [ ] **Step 7: Commit** + +```bash +git add providers/sitebuilder/render_pages.go providers/sitebuilder/tmpls.go providers/sitebuilder/builder.go layouts/simplecss/templates/pages_single.html providers/sitebuilder/builder_test.go +git commit -m "feat(pages): render pages in site builder after all other content" +``` + +--- + +### Task 10: Integration Test - Full Compile and Verify + +**Files:** None (verification only) + +- [ ] **Step 1: Run all tests** + +Run: `go test ./...` +Expected: All tests pass. + +- [ ] **Step 2: Verify clean build** + +Run: `go build ./...` +Expected: Clean compile, no errors. + +- [ ] **Step 3: Commit any fixes if needed** + +Only if previous steps required adjustments. From f17597e4b8ccd6283b4b7f100eca641169b6d659 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 17:57:49 +1100 Subject: [PATCH 16/40] feat(pages): add pages table schema and sqlc queries Co-Authored-By: Claude Sonnet 4.6 --- providers/db/gen/sqlgen/models.go | 14 ++ providers/db/gen/sqlgen/pages.sql.go | 219 +++++++++++++++++++++++++++ sql/queries/pages.sql | 34 +++++ sql/schema/06_pages.up.sql | 17 +++ 4 files changed, 284 insertions(+) create mode 100644 providers/db/gen/sqlgen/pages.sql.go create mode 100644 sql/queries/pages.sql create mode 100644 sql/schema/06_pages.up.sql diff --git a/providers/db/gen/sqlgen/models.go b/providers/db/gen/sqlgen/models.go index ae58594..3df1193 100644 --- a/providers/db/gen/sqlgen/models.go +++ b/providers/db/gen/sqlgen/models.go @@ -15,6 +15,20 @@ type Category struct { UpdatedAt int64 } +type Page struct { + ID int64 + SiteID int64 + Guid string + Title string + Slug string + Body string + PageType int64 + ShowInNav int64 + SortOrder int64 + CreatedAt int64 + UpdatedAt int64 +} + type PendingUpload struct { ID int64 SiteID int64 diff --git a/providers/db/gen/sqlgen/pages.sql.go b/providers/db/gen/sqlgen/pages.sql.go new file mode 100644 index 0000000..1d53291 --- /dev/null +++ b/providers/db/gen/sqlgen/pages.sql.go @@ -0,0 +1,219 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.28.0 +// source: pages.sql + +package sqlgen + +import ( + "context" +) + +const deletePage = `-- name: DeletePage :exec +DELETE FROM pages WHERE id = ? +` + +func (q *Queries) DeletePage(ctx context.Context, id int64) error { + _, err := q.db.ExecContext(ctx, deletePage, id) + return err +} + +const insertPage = `-- name: InsertPage :one +INSERT INTO pages ( + site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at +) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) +RETURNING id +` + +type InsertPageParams struct { + SiteID int64 + Guid string + Title string + Slug string + Body string + PageType int64 + ShowInNav int64 + SortOrder int64 + CreatedAt int64 + UpdatedAt int64 +} + +func (q *Queries) InsertPage(ctx context.Context, arg InsertPageParams) (int64, error) { + row := q.db.QueryRowContext(ctx, insertPage, + arg.SiteID, + arg.Guid, + arg.Title, + arg.Slug, + arg.Body, + arg.PageType, + arg.ShowInNav, + arg.SortOrder, + arg.CreatedAt, + arg.UpdatedAt, + ) + var id int64 + err := row.Scan(&id) + return id, err +} + +const selectPage = `-- name: SelectPage :one +SELECT id, site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at FROM pages WHERE id = ? LIMIT 1 +` + +func (q *Queries) SelectPage(ctx context.Context, id int64) (Page, error) { + row := q.db.QueryRowContext(ctx, selectPage, id) + var i Page + err := row.Scan( + &i.ID, + &i.SiteID, + &i.Guid, + &i.Title, + &i.Slug, + &i.Body, + &i.PageType, + &i.ShowInNav, + &i.SortOrder, + &i.CreatedAt, + &i.UpdatedAt, + ) + return i, err +} + +const selectPageByGUID = `-- name: SelectPageByGUID :one +SELECT id, site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at FROM pages WHERE guid = ? LIMIT 1 +` + +func (q *Queries) SelectPageByGUID(ctx context.Context, guid string) (Page, error) { + row := q.db.QueryRowContext(ctx, selectPageByGUID, guid) + var i Page + err := row.Scan( + &i.ID, + &i.SiteID, + &i.Guid, + &i.Title, + &i.Slug, + &i.Body, + &i.PageType, + &i.ShowInNav, + &i.SortOrder, + &i.CreatedAt, + &i.UpdatedAt, + ) + return i, err +} + +const selectPageBySlugAndSite = `-- name: SelectPageBySlugAndSite :one +SELECT id, site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at FROM pages WHERE site_id = ? AND slug = ? LIMIT 1 +` + +type SelectPageBySlugAndSiteParams struct { + SiteID int64 + Slug string +} + +func (q *Queries) SelectPageBySlugAndSite(ctx context.Context, arg SelectPageBySlugAndSiteParams) (Page, error) { + row := q.db.QueryRowContext(ctx, selectPageBySlugAndSite, arg.SiteID, arg.Slug) + var i Page + err := row.Scan( + &i.ID, + &i.SiteID, + &i.Guid, + &i.Title, + &i.Slug, + &i.Body, + &i.PageType, + &i.ShowInNav, + &i.SortOrder, + &i.CreatedAt, + &i.UpdatedAt, + ) + return i, err +} + +const selectPagesOfSite = `-- name: SelectPagesOfSite :many +SELECT id, site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at FROM pages +WHERE site_id = ? ORDER BY sort_order ASC +` + +func (q *Queries) SelectPagesOfSite(ctx context.Context, siteID int64) ([]Page, error) { + rows, err := q.db.QueryContext(ctx, selectPagesOfSite, siteID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Page + for rows.Next() { + var i Page + if err := rows.Scan( + &i.ID, + &i.SiteID, + &i.Guid, + &i.Title, + &i.Slug, + &i.Body, + &i.PageType, + &i.ShowInNav, + &i.SortOrder, + &i.CreatedAt, + &i.UpdatedAt, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const updatePage = `-- name: UpdatePage :exec +UPDATE pages SET + title = ?, + slug = ?, + body = ?, + page_type = ?, + show_in_nav = ?, + updated_at = ? +WHERE id = ? +` + +type UpdatePageParams struct { + Title string + Slug string + Body string + PageType int64 + ShowInNav int64 + UpdatedAt int64 + ID int64 +} + +func (q *Queries) UpdatePage(ctx context.Context, arg UpdatePageParams) error { + _, err := q.db.ExecContext(ctx, updatePage, + arg.Title, + arg.Slug, + arg.Body, + arg.PageType, + arg.ShowInNav, + arg.UpdatedAt, + arg.ID, + ) + return err +} + +const updatePageSortOrder = `-- name: UpdatePageSortOrder :exec +UPDATE pages SET sort_order = ? WHERE id = ? +` + +type UpdatePageSortOrderParams struct { + SortOrder int64 + ID int64 +} + +func (q *Queries) UpdatePageSortOrder(ctx context.Context, arg UpdatePageSortOrderParams) error { + _, err := q.db.ExecContext(ctx, updatePageSortOrder, arg.SortOrder, arg.ID) + return err +} diff --git a/sql/queries/pages.sql b/sql/queries/pages.sql new file mode 100644 index 0000000..0df22ff --- /dev/null +++ b/sql/queries/pages.sql @@ -0,0 +1,34 @@ +-- name: SelectPagesOfSite :many +SELECT * FROM pages +WHERE site_id = ? ORDER BY sort_order ASC; + +-- name: SelectPage :one +SELECT * FROM pages WHERE id = ? LIMIT 1; + +-- name: SelectPageByGUID :one +SELECT * FROM pages WHERE guid = ? LIMIT 1; + +-- name: SelectPageBySlugAndSite :one +SELECT * FROM pages WHERE site_id = ? AND slug = ? LIMIT 1; + +-- name: InsertPage :one +INSERT INTO pages ( + site_id, guid, title, slug, body, page_type, show_in_nav, sort_order, created_at, updated_at +) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) +RETURNING id; + +-- name: UpdatePage :exec +UPDATE pages SET + title = ?, + slug = ?, + body = ?, + page_type = ?, + show_in_nav = ?, + updated_at = ? +WHERE id = ?; + +-- name: UpdatePageSortOrder :exec +UPDATE pages SET sort_order = ? WHERE id = ?; + +-- name: DeletePage :exec +DELETE FROM pages WHERE id = ?; diff --git a/sql/schema/06_pages.up.sql b/sql/schema/06_pages.up.sql new file mode 100644 index 0000000..5090456 --- /dev/null +++ b/sql/schema/06_pages.up.sql @@ -0,0 +1,17 @@ +CREATE TABLE pages ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + site_id INTEGER NOT NULL, + guid TEXT NOT NULL, + title TEXT NOT NULL, + slug TEXT NOT NULL, + body TEXT NOT NULL, + page_type INTEGER NOT NULL DEFAULT 0, + show_in_nav INTEGER NOT NULL DEFAULT 0, + sort_order INTEGER NOT NULL DEFAULT 0, + created_at INTEGER NOT NULL, + updated_at INTEGER NOT NULL, + FOREIGN KEY (site_id) REFERENCES sites (id) ON DELETE CASCADE +); +CREATE INDEX idx_pages_site ON pages (site_id); +CREATE UNIQUE INDEX idx_pages_guid ON pages (guid); +CREATE UNIQUE INDEX idx_pages_site_slug ON pages (site_id, slug); From 7755bf50431dacbff913dbf87e055f791ba4b97a Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 17:58:37 +1100 Subject: [PATCH 17/40] feat(pages): add Page model and slug generator Co-Authored-By: Claude Sonnet 4.6 --- models/pages.go | 45 ++++++++++++++++++++++++++++++++++++++++++++ models/pages_test.go | 26 +++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 models/pages.go create mode 100644 models/pages_test.go diff --git a/models/pages.go b/models/pages.go new file mode 100644 index 0000000..1022120 --- /dev/null +++ b/models/pages.go @@ -0,0 +1,45 @@ +package models + +import ( + "strings" + "time" + "unicode" +) + +const ( + PageTypeNormal = 0 +) + +type Page struct { + ID int64 `json:"id"` + SiteID int64 `json:"site_id"` + GUID string `json:"guid"` + Title string `json:"title"` + Slug string `json:"slug"` + Body string `json:"body"` + PageType int `json:"page_type"` + ShowInNav bool `json:"show_in_nav"` + SortOrder int `json:"sort_order"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} + +// GeneratePageSlug creates a URL-safe slug from a page title. +// e.g. "About Me" -> "about-me" +func GeneratePageSlug(title string) string { + var sb strings.Builder + prevDash := false + for _, c := range strings.TrimSpace(title) { + if unicode.IsLetter(c) || unicode.IsNumber(c) { + sb.WriteRune(unicode.ToLower(c)) + prevDash = false + } else if unicode.IsSpace(c) || c == '-' || c == '_' { + if !prevDash && sb.Len() > 0 { + sb.WriteRune('-') + prevDash = true + } + } + } + result := sb.String() + return strings.TrimRight(result, "-") +} diff --git a/models/pages_test.go b/models/pages_test.go new file mode 100644 index 0000000..831b31f --- /dev/null +++ b/models/pages_test.go @@ -0,0 +1,26 @@ +package models_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "lmika.dev/lmika/weiro/models" +) + +func TestGeneratePageSlug(t *testing.T) { + tests := []struct { + title string + want string + }{ + {"About Me", "about-me"}, + {" Contact Us ", "contact-us"}, + {"Hello---World", "hello-world"}, + {"FAQ", "faq"}, + {"", ""}, + } + for _, tt := range tests { + t.Run(tt.title, func(t *testing.T) { + assert.Equal(t, tt.want, models.GeneratePageSlug(tt.title)) + }) + } +} From 2cd9ff87211455fc0014d8bfa3a9f0e15dd0474e Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 17:59:43 +1100 Subject: [PATCH 18/40] feat(pages): add DB provider methods for pages Co-Authored-By: Claude Sonnet 4.6 --- providers/db/pages.go | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 providers/db/pages.go diff --git a/providers/db/pages.go b/providers/db/pages.go new file mode 100644 index 0000000..1e5b9fc --- /dev/null +++ b/providers/db/pages.go @@ -0,0 +1,115 @@ +package db + +import ( + "context" + "time" + + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/providers/db/gen/sqlgen" +) + +func (db *Provider) SelectPagesOfSite(ctx context.Context, siteID int64) ([]*models.Page, error) { + rows, err := db.queries.SelectPagesOfSite(ctx, siteID) + if err != nil { + return nil, err + } + pages := make([]*models.Page, len(rows)) + for i, row := range rows { + pages[i] = dbPageToPage(row) + } + return pages, nil +} + +func (db *Provider) SelectPage(ctx context.Context, id int64) (*models.Page, error) { + row, err := db.queries.SelectPage(ctx, id) + if err != nil { + return nil, err + } + return dbPageToPage(row), nil +} + +func (db *Provider) SelectPageByGUID(ctx context.Context, guid string) (*models.Page, error) { + row, err := db.queries.SelectPageByGUID(ctx, guid) + if err != nil { + return nil, err + } + return dbPageToPage(row), nil +} + +func (db *Provider) SelectPageBySlugAndSite(ctx context.Context, siteID int64, slug string) (*models.Page, error) { + row, err := db.queries.SelectPageBySlugAndSite(ctx, sqlgen.SelectPageBySlugAndSiteParams{ + SiteID: siteID, + Slug: slug, + }) + if err != nil { + return nil, err + } + return dbPageToPage(row), nil +} + +func (db *Provider) SavePage(ctx context.Context, page *models.Page) error { + if page.ID == 0 { + showInNav := int64(0) + if page.ShowInNav { + showInNav = 1 + } + newID, err := db.queries.InsertPage(ctx, sqlgen.InsertPageParams{ + SiteID: page.SiteID, + Guid: page.GUID, + Title: page.Title, + Slug: page.Slug, + Body: page.Body, + PageType: int64(page.PageType), + ShowInNav: showInNav, + SortOrder: int64(page.SortOrder), + CreatedAt: timeToInt(page.CreatedAt), + UpdatedAt: timeToInt(page.UpdatedAt), + }) + if err != nil { + return err + } + page.ID = newID + return nil + } + + showInNav := int64(0) + if page.ShowInNav { + showInNav = 1 + } + return db.queries.UpdatePage(ctx, sqlgen.UpdatePageParams{ + Title: page.Title, + Slug: page.Slug, + Body: page.Body, + PageType: int64(page.PageType), + ShowInNav: showInNav, + UpdatedAt: timeToInt(page.UpdatedAt), + ID: page.ID, + }) +} + +func (db *Provider) UpdatePageSortOrder(ctx context.Context, id int64, sortOrder int) error { + return db.queries.UpdatePageSortOrder(ctx, sqlgen.UpdatePageSortOrderParams{ + SortOrder: int64(sortOrder), + ID: id, + }) +} + +func (db *Provider) DeletePage(ctx context.Context, id int64) error { + return db.queries.DeletePage(ctx, id) +} + +func dbPageToPage(row sqlgen.Page) *models.Page { + return &models.Page{ + ID: row.ID, + SiteID: row.SiteID, + GUID: row.Guid, + Title: row.Title, + Slug: row.Slug, + Body: row.Body, + PageType: int(row.PageType), + ShowInNav: row.ShowInNav != 0, + SortOrder: int(row.SortOrder), + CreatedAt: time.Unix(row.CreatedAt, 0).UTC(), + UpdatedAt: time.Unix(row.UpdatedAt, 0).UTC(), + } +} From 1edcd7686cf9ee9cc5c317c97d05d91912949b43 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 18:01:36 +1100 Subject: [PATCH 19/40] feat(pages): add pages service layer Implements the pages service with ListPages, GetPage, CreatePage, UpdatePage, DeletePage, and ReorderPages methods. Wires the service into the service registry and generalises SlugConflictError message. Co-Authored-By: Claude Sonnet 4.6 --- models/errors.go | 2 +- services/pages/service.go | 189 ++++++++++++++++++++++++++++++++++++++ services/services.go | 4 + 3 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 services/pages/service.go diff --git a/models/errors.go b/models/errors.go index eda780c..3efadbc 100644 --- a/models/errors.go +++ b/models/errors.go @@ -7,4 +7,4 @@ var PermissionError = errors.New("permission denied") var NotFoundError = errors.New("not found") var SiteRequiredError = errors.New("site required") var DeleteDebounceError = errors.New("permanent delete too soon, try again in a few seconds") -var SlugConflictError = errors.New("a category with this slug already exists") +var SlugConflictError = errors.New("a record with this slug already exists") diff --git a/services/pages/service.go b/services/pages/service.go new file mode 100644 index 0000000..37c4144 --- /dev/null +++ b/services/pages/service.go @@ -0,0 +1,189 @@ +package pages + +import ( + "context" + "time" + + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/providers/db" + "lmika.dev/lmika/weiro/services/publisher" +) + +type CreatePageParams struct { + GUID string `form:"guid" json:"guid"` + Title string `form:"title" json:"title"` + Slug string `form:"slug" json:"slug"` + Body string `form:"body" json:"body"` + PageType int `form:"page_type" json:"page_type"` + ShowInNav bool `form:"show_in_nav" json:"show_in_nav"` +} + +type Service struct { + db *db.Provider + publisher *publisher.Queue +} + +func New(db *db.Provider, publisher *publisher.Queue) *Service { + return &Service{db: db, publisher: publisher} +} + +func (s *Service) ListPages(ctx context.Context) ([]*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + return s.db.SelectPagesOfSite(ctx, site.ID) +} + +func (s *Service) GetPage(ctx context.Context, id int64) (*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return nil, err + } + if page.SiteID != site.ID { + return nil, models.NotFoundError + } + return page, nil +} + +func (s *Service) CreatePage(ctx context.Context, params CreatePageParams) (*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + + now := time.Now() + slug := params.Slug + if slug == "" { + slug = models.GeneratePageSlug(params.Title) + } + + // Check slug collision + if _, err := s.db.SelectPageBySlugAndSite(ctx, site.ID, slug); err == nil { + return nil, models.SlugConflictError + } else if !db.ErrorIsNoRows(err) { + return nil, err + } + + // Determine sort order: place at end + existingPages, err := s.db.SelectPagesOfSite(ctx, site.ID) + if err != nil { + return nil, err + } + sortOrder := len(existingPages) + + page := &models.Page{ + SiteID: site.ID, + GUID: params.GUID, + Title: params.Title, + Slug: slug, + Body: params.Body, + PageType: params.PageType, + ShowInNav: params.ShowInNav, + SortOrder: sortOrder, + CreatedAt: now, + UpdatedAt: now, + } + if page.GUID == "" { + page.GUID = models.NewNanoID() + } + + if err := s.db.SavePage(ctx, page); err != nil { + return nil, err + } + + s.publisher.Queue(site) + return page, nil +} + +func (s *Service) UpdatePage(ctx context.Context, id int64, params CreatePageParams) (*models.Page, error) { + site, ok := models.GetSite(ctx) + if !ok { + return nil, models.SiteRequiredError + } + + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return nil, err + } + if page.SiteID != site.ID { + return nil, models.NotFoundError + } + + slug := params.Slug + if slug == "" { + slug = models.GeneratePageSlug(params.Title) + } + + // Check slug collision (exclude self) + if existing, err := s.db.SelectPageBySlugAndSite(ctx, site.ID, slug); err == nil && existing.ID != page.ID { + return nil, models.SlugConflictError + } else if err != nil && !db.ErrorIsNoRows(err) { + return nil, err + } + + page.Title = params.Title + page.Slug = slug + page.Body = params.Body + page.PageType = params.PageType + page.ShowInNav = params.ShowInNav + page.UpdatedAt = time.Now() + + if err := s.db.SavePage(ctx, page); err != nil { + return nil, err + } + + s.publisher.Queue(site) + return page, nil +} + +func (s *Service) DeletePage(ctx context.Context, id int64) error { + site, ok := models.GetSite(ctx) + if !ok { + return models.SiteRequiredError + } + + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return err + } + if page.SiteID != site.ID { + return models.NotFoundError + } + + if err := s.db.DeletePage(ctx, id); err != nil { + return err + } + + s.publisher.Queue(site) + return nil +} + +func (s *Service) ReorderPages(ctx context.Context, pageIDs []int64) error { + site, ok := models.GetSite(ctx) + if !ok { + return models.SiteRequiredError + } + + // Verify all pages belong to this site + for i, id := range pageIDs { + page, err := s.db.SelectPage(ctx, id) + if err != nil { + return err + } + if page.SiteID != site.ID { + return models.NotFoundError + } + if err := s.db.UpdatePageSortOrder(ctx, id, i); err != nil { + return err + } + } + + s.publisher.Queue(site) + return nil +} diff --git a/services/services.go b/services/services.go index beb6727..852dea3 100644 --- a/services/services.go +++ b/services/services.go @@ -8,6 +8,7 @@ import ( "lmika.dev/lmika/weiro/providers/uploadfiles" "lmika.dev/lmika/weiro/services/auth" "lmika.dev/lmika/weiro/services/categories" + "lmika.dev/lmika/weiro/services/pages" "lmika.dev/lmika/weiro/services/posts" "lmika.dev/lmika/weiro/services/publisher" "lmika.dev/lmika/weiro/services/sites" @@ -23,6 +24,7 @@ type Services struct { Sites *sites.Service Uploads *uploads.Service Categories *categories.Service + Pages *pages.Service } func New(cfg config.Config) (*Services, error) { @@ -40,6 +42,7 @@ func New(cfg config.Config) (*Services, error) { siteService := sites.New(dbp) uploadService := uploads.New(dbp, ufp, filepath.Join(cfg.ScratchDir, "uploads", "pending")) categoriesService := categories.New(dbp, publisherQueue) + pagesService := pages.New(dbp, publisherQueue) return &Services{ DB: dbp, @@ -50,6 +53,7 @@ func New(cfg config.Config) (*Services, error) { Sites: siteService, Uploads: uploadService, Categories: categoriesService, + Pages: pagesService, }, nil } From f386403ced0adb44aa8d3ee4140660617ed78ffb Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 18:03:06 +1100 Subject: [PATCH 20/40] feat(pages): add pages handler and admin routes Co-Authored-By: Claude Sonnet 4.6 --- cmds/server.go | 9 ++++ handlers/pages.go | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 handlers/pages.go diff --git a/cmds/server.go b/cmds/server.go index 56517e7..89310bd 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -113,6 +113,7 @@ Starting weiro without any arguments will start the server. uh := handlers.UploadsHandler{UploadsService: svcs.Uploads} ssh := handlers.SiteSettingsHandler{SiteService: svcs.Sites} ch := handlers.CategoriesHandler{CategoryService: svcs.Categories} + pgh := handlers.PagesHandler{PageService: svcs.Pages} app.Get("/login", lh.Login) app.Post("/login", lh.DoLogin) @@ -149,6 +150,14 @@ Starting weiro without any arguments will start the server. siteGroup.Post("/categories/:categoryID", ch.Update) siteGroup.Post("/categories/:categoryID/delete", ch.Delete) + siteGroup.Get("/pages", pgh.Index) + siteGroup.Get("/pages/new", pgh.New) + siteGroup.Get("/pages/:pageID", pgh.Edit) + siteGroup.Post("/pages", pgh.Create) + siteGroup.Post("/pages/reorder", pgh.Reorder) + siteGroup.Post("/pages/:pageID", pgh.Update) + siteGroup.Post("/pages/:pageID/delete", pgh.Delete) + app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index) app.Get("/first-run", ih.FirstRun) app.Post("/first-run", ih.FirstRunSubmit) diff --git a/handlers/pages.go b/handlers/pages.go new file mode 100644 index 0000000..2bdb04f --- /dev/null +++ b/handlers/pages.go @@ -0,0 +1,118 @@ +package handlers + +import ( + "fmt" + "strconv" + + "github.com/gofiber/fiber/v3" + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/services/pages" +) + +type PagesHandler struct { + PageService *pages.Service +} + +func (ph PagesHandler) Index(c fiber.Ctx) error { + pagesList, err := ph.PageService.ListPages(c.Context()) + if err != nil { + return err + } + + return c.Render("pages/index", fiber.Map{ + "pages": pagesList, + }) +} + +func (ph PagesHandler) New(c fiber.Ctx) error { + page := models.Page{ + GUID: models.NewNanoID(), + } + return c.Render("pages/edit", fiber.Map{ + "page": page, + "isNew": true, + "bodyClass": "page-edit-page", + }) +} + +func (ph PagesHandler) Edit(c fiber.Ctx) error { + pageID, err := strconv.ParseInt(c.Params("pageID"), 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + page, err := ph.PageService.GetPage(c.Context(), pageID) + if err != nil { + return err + } + + return c.Render("pages/edit", fiber.Map{ + "page": page, + "isNew": false, + "bodyClass": "page-edit-page", + }) +} + +func (ph PagesHandler) Create(c fiber.Ctx) error { + var req pages.CreatePageParams + if err := c.Bind().Body(&req); err != nil { + return err + } + + _, err := ph.PageService.CreatePage(c.Context(), req) + if err != nil { + return err + } + + site := models.MustGetSite(c.Context()) + return c.Redirect().To(fmt.Sprintf("/sites/%v/pages", site.ID)) +} + +func (ph PagesHandler) Update(c fiber.Ctx) error { + pageID, err := strconv.ParseInt(c.Params("pageID"), 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + var req pages.CreatePageParams + if err := c.Bind().Body(&req); err != nil { + return err + } + + _, err = ph.PageService.UpdatePage(c.Context(), pageID, req) + if err != nil { + return err + } + + site := models.MustGetSite(c.Context()) + return c.Redirect().To(fmt.Sprintf("/sites/%v/pages", site.ID)) +} + +func (ph PagesHandler) Delete(c fiber.Ctx) error { + pageID, err := strconv.ParseInt(c.Params("pageID"), 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + if err := ph.PageService.DeletePage(c.Context(), pageID); err != nil { + return err + } + + site := models.MustGetSite(c.Context()) + return c.Redirect().To(fmt.Sprintf("/sites/%v/pages", site.ID)) +} + +func (ph PagesHandler) Reorder(c fiber.Ctx) error { + var req struct { + PageIDs []int64 `json:"page_ids"` + } + if err := c.Bind().Body(&req); err != nil { + return err + } + + if err := ph.PageService.ReorderPages(c.Context(), req.PageIDs); err != nil { + return err + } + + return c.JSON(fiber.Map{"ok": true}) +} From 5eece96700a41bc267305d1f5dfa3d6176902b43 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 19:06:48 +1100 Subject: [PATCH 21/40] feat(pages): add admin page list with drag-and-drop reorder Co-Authored-By: Claude Sonnet 4.6 --- assets/js/controllers/pagelist.js | 63 +++++++++++++++++++++++++++++++ assets/js/main.js | 4 +- views/_common/nav.html | 3 ++ views/pages/index.html | 35 +++++++++++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 assets/js/controllers/pagelist.js create mode 100644 views/pages/index.html diff --git a/assets/js/controllers/pagelist.js b/assets/js/controllers/pagelist.js new file mode 100644 index 0000000..7da6872 --- /dev/null +++ b/assets/js/controllers/pagelist.js @@ -0,0 +1,63 @@ +import { Controller } from "@hotwired/stimulus" +import { showToast } from "../services/toast"; + +export default class PagelistController extends Controller { + static values = { + siteId: Number, + }; + + static targets = ["list"]; + + dragStart(ev) { + this.draggedRow = ev.currentTarget; + ev.currentTarget.classList.add("opacity-50"); + ev.dataTransfer.effectAllowed = "move"; + } + + dragOver(ev) { + ev.preventDefault(); + ev.dataTransfer.dropEffect = "move"; + } + + drop(ev) { + ev.preventDefault(); + const targetRow = ev.currentTarget; + if (this.draggedRow && this.draggedRow !== targetRow) { + const rows = [...this.listTarget.children]; + const draggedIdx = rows.indexOf(this.draggedRow); + const targetIdx = rows.indexOf(targetRow); + if (draggedIdx < targetIdx) { + targetRow.after(this.draggedRow); + } else { + targetRow.before(this.draggedRow); + } + this.saveOrder(); + } + } + + dragEnd(ev) { + ev.currentTarget.classList.remove("opacity-50"); + this.draggedRow = null; + } + + async saveOrder() { + const rows = [...this.listTarget.children]; + const pageIds = rows.map(row => parseInt(row.dataset.pageId, 10)); + + try { + await fetch(`/sites/${this.siteIdValue}/pages/reorder`, { + method: "POST", + headers: { + "Content-Type": "application/json", + "Accept": "application/json", + }, + body: JSON.stringify({ page_ids: pageIds }), + }); + } catch (error) { + showToast({ + title: "Error", + body: "Failed to reorder pages.", + }); + } + } +} diff --git a/assets/js/main.js b/assets/js/main.js index d76c353..28451fb 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -7,6 +7,7 @@ import LogoutController from "./controllers/logout"; import FirstRunController from "./controllers/firstrun"; import UploadController from "./controllers/upload"; import ShowUploadController from "./controllers/show_upload"; +import PagelistController from "./controllers/pagelist"; window.Stimulus = Application.start() Stimulus.register("toast", ToastController); @@ -15,4 +16,5 @@ Stimulus.register("postedit", PosteditController); Stimulus.register("logout", LogoutController); Stimulus.register("first-run", FirstRunController); Stimulus.register("upload", UploadController); -Stimulus.register("show-upload", ShowUploadController); \ No newline at end of file +Stimulus.register("show-upload", ShowUploadController); +Stimulus.register("pagelist", PagelistController); \ No newline at end of file diff --git a/views/_common/nav.html b/views/_common/nav.html index e8bce30..ed7a1a9 100644 --- a/views/_common/nav.html +++ b/views/_common/nav.html @@ -13,6 +13,9 @@
  • Categories
    • +
  • + Pages +
  • Uploads
    • diff --git a/views/pages/index.html b/views/pages/index.html new file mode 100644 index 0000000..3011c64 --- /dev/null +++ b/views/pages/index.html @@ -0,0 +1,35 @@ +
    +
    +
    + New Page +
    +
    + + {{ if .pages }} + + + + + + + + + + + {{ range .pages }} + + + + + + + {{ end }} + +
    TitleSlugNav
    ☰{{ .Title }}{{ .Slug }}{{ if .ShowInNav }}Yes{{ end }}
    + {{ else }} +
    +
    No pages yet.
    +
    + {{ end }} +
    From 255fa26a15c6c756648765298d68fed4f771cfe7 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 19:07:49 +1100 Subject: [PATCH 22/40] feat(pages): add admin page edit form with sidebar Co-Authored-By: Claude Sonnet 4.6 --- views/pages/edit.html | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 views/pages/edit.html diff --git a/views/pages/edit.html b/views/pages/edit.html new file mode 100644 index 0000000..1c4b8c0 --- /dev/null +++ b/views/pages/edit.html @@ -0,0 +1,53 @@ +
    + {{ if .isNew }} +
    + {{ else }} + + {{ end }} + +
    +
    +
    + +
    +
    + +
    +
    + + {{ if not .isNew }} + + {{ end }} +
    +
    +
    +
    +
    Page Settings
    +
    +
    + + +
    Auto-generated from title if left blank.
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    + + {{ if not .isNew }} + + {{ end }} +
    From d464821a8c0c5a63ce1aa365ad850082601923ba Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 19:09:01 +1100 Subject: [PATCH 23/40] feat(pages): populate pages in publisher for site generation --- models/pubmodel/sites.go | 1 + services/publisher/service.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/models/pubmodel/sites.go b/models/pubmodel/sites.go index a8862c4..38ba614 100644 --- a/models/pubmodel/sites.go +++ b/models/pubmodel/sites.go @@ -18,4 +18,5 @@ type Site struct { Categories []models.CategoryWithCount PostIterByCategory func(ctx context.Context, categoryID int64) iter.Seq[models.Maybe[*models.Post]] CategoriesOfPost func(ctx context.Context, postID int64) ([]*models.Category, error) + Pages []*models.Page } diff --git a/services/publisher/service.go b/services/publisher/service.go index 939817a..e6ccde3 100644 --- a/services/publisher/service.go +++ b/services/publisher/service.go @@ -65,6 +65,12 @@ func (p *Publisher) Publish(ctx context.Context, site models.Site) error { }) } + // Fetch pages + sitePages, err := p.db.SelectPagesOfSite(ctx, site.ID) + if err != nil { + return err + } + for _, target := range targets { if !target.Enabled { continue @@ -84,6 +90,7 @@ func (p *Publisher) Publish(ctx context.Context, site models.Site) error { CategoriesOfPost: func(ctx context.Context, postID int64) ([]*models.Category, error) { return p.db.SelectCategoriesOfPost(ctx, postID) }, + Pages: sitePages, OpenUpload: func(u models.Upload) (io.ReadCloser, error) { return p.up.OpenUpload(site, u) }, From ef038172ac7704851dbe6641eed191f973444258 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 22 Mar 2026 19:11:12 +1100 Subject: [PATCH 24/40] feat(pages): render pages in site builder after all other content Co-Authored-By: Claude Sonnet 4.6 --- layouts/simplecss/templates/pages_single.html | 2 ++ providers/sitebuilder/builder.go | 7 ++++- providers/sitebuilder/builder_test.go | 5 +++ providers/sitebuilder/render_pages.go | 31 +++++++++++++++++++ providers/sitebuilder/tmpls.go | 9 ++++++ 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 layouts/simplecss/templates/pages_single.html create mode 100644 providers/sitebuilder/render_pages.go diff --git a/layouts/simplecss/templates/pages_single.html b/layouts/simplecss/templates/pages_single.html new file mode 100644 index 0000000..6883c3e --- /dev/null +++ b/layouts/simplecss/templates/pages_single.html @@ -0,0 +1,2 @@ +{{ if .Page.Title }}

    {{ .Page.Title }}

    {{ end }} +{{ .HTML }} diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index 9e5199d..93d787e 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -118,7 +118,12 @@ func (b *Builder) BuildSite(outDir string) error { // Build static assets eg.Go(func() error { return b.writeStaticAssets(buildCtx) }) - return eg.Wait() + if err := eg.Wait(); err != nil { + return err + } + + // Render pages last so they can override auto-generated content + return b.renderPages(buildCtx) } func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Context) error { diff --git a/providers/sitebuilder/builder_test.go b/providers/sitebuilder/builder_test.go index a5a9bbf..3fec74f 100644 --- a/providers/sitebuilder/builder_test.go +++ b/providers/sitebuilder/builder_test.go @@ -22,6 +22,7 @@ func TestBuilder_BuildSite(t *testing.T) { "layout_main.html": {Data: []byte(`{{ .Body }}`)}, "categories_list.html": {Data: []byte(`{{ range .Categories}}{{.Name}},{{ end }}`)}, "categories_single.html": {Data: []byte(`

    {{.Category.Name}}

    `)}, + "pages_single.html": {Data: []byte(`{{ if .Page.Title }}

    {{ .Page.Title }}

    {{ end }}{{ .HTML }}`)}, } posts := []*models.Post{ @@ -49,11 +50,15 @@ func TestBuilder_BuildSite(t *testing.T) { } } }, + Pages: []*models.Page{ + {Title: "About", Slug: "about", Body: "About this site"}, + }, } wantFiles := map[string]string{ "2026/02/18/test-post/index.html": "

    This is a test post

    \n", "2026/02/20/another-post/index.html": "

    This is another test post

    \n", "index.html": "Test Post,Another Post,", + "about/index.html": "

    About

    About this site

    \n", } outDir := t.TempDir() diff --git a/providers/sitebuilder/render_pages.go b/providers/sitebuilder/render_pages.go new file mode 100644 index 0000000..6183088 --- /dev/null +++ b/providers/sitebuilder/render_pages.go @@ -0,0 +1,31 @@ +package sitebuilder + +import ( + "bytes" + "context" + "html/template" + "io" +) + +func (b *Builder) renderPages(bctx buildContext) error { + for _, page := range b.site.Pages { + var md bytes.Buffer + if err := b.mdRenderer.RenderTo(context.Background(), &md, page.Body); err != nil { + return err + } + + data := pageSingleData{ + commonData: commonData{Site: b.site}, + Page: page, + HTML: template.HTML(md.String()), + } + + path := "/" + page.Slug + if err := b.createAtPath(bctx, path, func(f io.Writer) error { + return b.renderTemplate(f, tmplNamePageSingle, data) + }); err != nil { + return err + } + } + return nil +} diff --git a/providers/sitebuilder/tmpls.go b/providers/sitebuilder/tmpls.go index e0ece37..a0c8e34 100644 --- a/providers/sitebuilder/tmpls.go +++ b/providers/sitebuilder/tmpls.go @@ -26,6 +26,9 @@ const ( // tmplNameCategorySingle is the template for a single category page tmplNameCategorySingle = "categories_single.html" + + // tmplNamePageSingle is the template for a single page (pageSingleData) + tmplNamePageSingle = "pages_single.html" ) type Options struct { @@ -92,3 +95,9 @@ type categorySingleData struct { PrevURL string NextURL string } + +type pageSingleData struct { + commonData + Page *models.Page + HTML template.HTML +} From 5badce0d1620ced942a24217fdef4c5f9321278b Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Mon, 23 Mar 2026 21:48:43 +1100 Subject: [PATCH 25/40] Updated some settings in pages --- handlers/pages.go | 4 +-- .../templates/categories_single.html | 4 +-- layouts/simplecss/templates/posts_list.html | 4 +-- providers/sitebuilder/builder.go | 12 +++---- providers/sitebuilder/tmpls.go | 7 ++-- services/pages/service.go | 9 +++++ services/publisher/service.go | 15 ++++---- views/_common/nav.html | 6 ++-- views/pages/edit.html | 34 ++++++++++--------- views/posts/edit.html | 8 ++--- 10 files changed, 56 insertions(+), 47 deletions(-) diff --git a/handlers/pages.go b/handlers/pages.go index 2bdb04f..abefb41 100644 --- a/handlers/pages.go +++ b/handlers/pages.go @@ -31,7 +31,7 @@ func (ph PagesHandler) New(c fiber.Ctx) error { return c.Render("pages/edit", fiber.Map{ "page": page, "isNew": true, - "bodyClass": "page-edit-page", + "bodyClass": "post-edit-page", }) } @@ -49,7 +49,7 @@ func (ph PagesHandler) Edit(c fiber.Ctx) error { return c.Render("pages/edit", fiber.Map{ "page": page, "isNew": false, - "bodyClass": "page-edit-page", + "bodyClass": "post-edit-page", }) } diff --git a/layouts/simplecss/templates/categories_single.html b/layouts/simplecss/templates/categories_single.html index e9e7116..133ad8d 100644 --- a/layouts/simplecss/templates/categories_single.html +++ b/layouts/simplecss/templates/categories_single.html @@ -11,7 +11,7 @@ {{ end }} {{ if or .PrevURL .NextURL }} {{ end }} diff --git a/layouts/simplecss/templates/posts_list.html b/layouts/simplecss/templates/posts_list.html index 6a2eca6..6a71533 100644 --- a/layouts/simplecss/templates/posts_list.html +++ b/layouts/simplecss/templates/posts_list.html @@ -8,7 +8,7 @@ {{ end }} {{ if or .PrevURL .NextURL }} {{ end }} diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index 93d787e..71ce926 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -166,14 +166,10 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co var prevURL, nextURL string if page > 1 { - if page == 2 { - prevURL = "/posts/" - } else { - prevURL = fmt.Sprintf("/posts/%d/", page-1) - } + prevURL = fmt.Sprintf("%v/%d", b.opts.BasePostList, page-1) } if page < totalPages { - nextURL = fmt.Sprintf("/posts/%d/", page+1) + nextURL = fmt.Sprintf("%v/%d", b.opts.BasePostList, page+1) } pl := postListData{ @@ -187,9 +183,9 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co // Page 1 renders at both root and /posts/ var paths []string if page == 1 { - paths = []string{"", "/posts"} + paths = []string{"", fmt.Sprintf("%v/1", b.opts.BasePostList)} } else { - paths = []string{fmt.Sprintf("/posts/%d", page)} + paths = []string{fmt.Sprintf("%v/%d", b.opts.BasePostList, page)} } for _, path := range paths { diff --git a/providers/sitebuilder/tmpls.go b/providers/sitebuilder/tmpls.go index a0c8e34..029cab0 100644 --- a/providers/sitebuilder/tmpls.go +++ b/providers/sitebuilder/tmpls.go @@ -32,9 +32,10 @@ const ( ) type Options struct { - BasePosts string // BasePosts is the base path for posts. - BaseUploads string // BaseUploads is the base path for uploads. - BaseStatic string // BaseStatic is the base path for static assets. + BasePosts string // BasePosts is the base path for posts. + BasePostList string // BasePostList is the base path for post lists. + BaseUploads string // BaseUploads is the base path for uploads. + BaseStatic string // BaseStatic is the base path for static assets. // TemplatesFS provides the raw templates for rendering the site. TemplatesFS fs.FS diff --git a/services/pages/service.go b/services/pages/service.go index 37c4144..8a82bc0 100644 --- a/services/pages/service.go +++ b/services/pages/service.go @@ -2,6 +2,7 @@ package pages import ( "context" + "strings" "time" "lmika.dev/lmika/weiro/models" @@ -63,6 +64,10 @@ func (s *Service) CreatePage(ctx context.Context, params CreatePageParams) (*mod slug = models.GeneratePageSlug(params.Title) } + if !strings.HasPrefix(slug, "/") { + slug = "/" + slug + } + // Check slug collision if _, err := s.db.SelectPageBySlugAndSite(ctx, site.ID, slug); err == nil { return nil, models.SlugConflictError @@ -120,6 +125,10 @@ func (s *Service) UpdatePage(ctx context.Context, id int64, params CreatePagePar slug = models.GeneratePageSlug(params.Title) } + if !strings.HasPrefix(slug, "/") { + slug = "/" + slug + } + // Check slug collision (exclude self) if existing, err := s.db.SelectPageBySlugAndSite(ctx, site.ID, slug); err == nil && existing.ID != page.ID { return nil, models.SlugConflictError diff --git a/services/publisher/service.go b/services/publisher/service.go index e6ccde3..adfcdd7 100644 --- a/services/publisher/service.go +++ b/services/publisher/service.go @@ -121,13 +121,14 @@ func (p *Publisher) publishSite(ctx context.Context, pubSite pubmodel.Site, targ } sb, err := sitebuilder.New(pubSite, sitebuilder.Options{ - BasePosts: "/posts", - BaseUploads: "/uploads", - BaseStatic: "/static", - TemplatesFS: templateFS, - StaticFS: staticFS, - FeedItems: 30, - RenderTZ: renderTZ, + BasePosts: "/posts", + BasePostList: "/pages", + BaseUploads: "/uploads", + BaseStatic: "/static", + TemplatesFS: templateFS, + StaticFS: staticFS, + FeedItems: 30, + RenderTZ: renderTZ, }) if err != nil { return err diff --git a/views/_common/nav.html b/views/_common/nav.html index ed7a1a9..e9c0de7 100644 --- a/views/_common/nav.html +++ b/views/_common/nav.html @@ -10,15 +10,15 @@
  • Posts
    • -
  • - Categories -
  • Pages
  • Uploads
    • +
  • + Categories +
  • Settings
    • diff --git a/views/pages/edit.html b/views/pages/edit.html index 1c4b8c0..d534b80 100644 --- a/views/pages/edit.html +++ b/views/pages/edit.html @@ -1,8 +1,8 @@ -
    +
    {{ if .isNew }} -
    + {{ else }} - + {{ end }}
    @@ -10,10 +10,8 @@
    -
    - -
    -
    + +
    {{ if not .isNew }}
    -
    +
    {{ if $isPublished }} - + {{ else }} - - + + {{ end }}
    From d80aacc180a225da45cd54f02ecdaf4b7d85d128 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Tue, 24 Mar 2026 11:08:51 +1100 Subject: [PATCH 26/40] Added a site picker plus options to create new sites --- assets/css/main.scss | 9 +++++ assets/js/main.js | 5 ++- cmds/server.go | 18 ++++++---- handlers/middleware/errlog.go | 2 +- handlers/middleware/site.go | 12 ++++++- handlers/sitesettings.go | 24 +++++++++++-- package-lock.json | 36 ++++++++++++++++--- package.json | 3 +- services/sites/services.go | 66 ++++++++++++++++++++++++++++++----- views/_common/nav.html | 20 ++++++++++- views/index/first-run.html | 2 +- views/pages/index.html | 2 +- views/sitesettings/new.html | 29 +++++++++++++++ views/uploads/index.html | 4 +++ 14 files changed, 203 insertions(+), 29 deletions(-) create mode 100644 views/sitesettings/new.html diff --git a/assets/css/main.scss b/assets/css/main.scss index dc6ad7d..2e0883a 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -10,6 +10,15 @@ $container-max-widths: ( @import "bootstrap/scss/bootstrap.scss"; +// Navbar + +.navbar-site-visit { + display: inline-block; + line-height: 2em; + margin-bottom: 4px; + margin-right: 10px; +} + // Post list .postlist .post img { diff --git a/assets/js/main.js b/assets/js/main.js index 28451fb..fcbe286 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,3 +1,4 @@ +import feather from "feather-icons/dist/feather.js"; import { Application } from "@hotwired/stimulus"; import ToastController from "./controllers/toast"; @@ -17,4 +18,6 @@ Stimulus.register("logout", LogoutController); Stimulus.register("first-run", FirstRunController); Stimulus.register("upload", UploadController); Stimulus.register("show-upload", ShowUploadController); -Stimulus.register("pagelist", PagelistController); \ No newline at end of file +Stimulus.register("pagelist", PagelistController); + +feather.replace(); \ No newline at end of file diff --git a/cmds/server.go b/cmds/server.go index 89310bd..36e5923 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -119,7 +119,17 @@ Starting weiro without any arguments will start the server. app.Post("/login", lh.DoLogin) app.Post("/logout", lh.Logout) - siteGroup := app.Group("/sites/:siteID", middleware.LogErrors(), middleware.RequireUser(svcs.Auth), middleware.RequiresSite(svcs.Sites)) + app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index) + app.Get("/first-run", ih.FirstRun) + app.Post("/first-run", ih.FirstRunSubmit) + + app.Get("/static/*", static.New("./static")) + + app.Use(middleware.LogErrors(), middleware.RequireUser(svcs.Auth)) + + app.Get("/sites/new", ssh.New) + app.Post("/sites", ssh.Create) + siteGroup := app.Group("/sites/:siteID", middleware.RequiresSite(svcs.Sites)) siteGroup.Get("/posts", ph.Index) siteGroup.Get("/posts/new", ph.New) @@ -158,12 +168,6 @@ Starting weiro without any arguments will start the server. siteGroup.Post("/pages/:pageID", pgh.Update) siteGroup.Post("/pages/:pageID/delete", pgh.Delete) - app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index) - app.Get("/first-run", ih.FirstRun) - app.Post("/first-run", ih.FirstRunSubmit) - - app.Get("/static/*", static.New("./static")) - if err := app.Listen(":3000"); err != nil { log.Println(err) } diff --git a/handlers/middleware/errlog.go b/handlers/middleware/errlog.go index 5b6dfa6..2acac04 100644 --- a/handlers/middleware/errlog.go +++ b/handlers/middleware/errlog.go @@ -9,7 +9,7 @@ import ( func LogErrors() func(c fiber.Ctx) error { return func(c fiber.Ctx) error { if err := c.Next(); err != nil { - log.Printf("error: %v\n", err) + log.Printf("%v: error: %v\n", c.Path(), err) return err } return nil diff --git a/handlers/middleware/site.go b/handlers/middleware/site.go index 54211bc..6f47430 100644 --- a/handlers/middleware/site.go +++ b/handlers/middleware/site.go @@ -32,9 +32,19 @@ func RequiresSite(sites *sites.Service) func(c fiber.Ctx) error { return err } } - c.Locals("site", site) c.SetContext(models.WithSite(c.Context(), site)) + + sitesOwnedByUser, err := sites.ListSites(c.Context()) + if err != nil { + return err + } + c.Locals("allSites", sitesOwnedByUser) + + if pubTargets, err := sites.BestPubTarget(c.Context(), site); err == nil { + c.Locals("pubTarget", pubTargets) + } + return c.Next() } } diff --git a/handlers/sitesettings.go b/handlers/sitesettings.go index 0fe2100..e61ced4 100644 --- a/handlers/sitesettings.go +++ b/handlers/sitesettings.go @@ -12,10 +12,28 @@ type SiteSettingsHandler struct { SiteService *sites.Service } -func (s *SiteSettingsHandler) General(ctx fiber.Ctx) error { - site := ctx.Locals("site").(models.Site) +func (s *SiteSettingsHandler) New(c fiber.Ctx) error { + return c.Render("sitesettings/new", fiber.Map{}, "layouts/bare_with_scripts") +} - return ctx.Render("sitesettings/general", fiber.Map{ +func (s *SiteSettingsHandler) Create(c fiber.Ctx) error { + var params sites.CreateSiteParams + if err := c.Bind().Body(¶ms); err != nil { + return err + } + + newSite, err := s.SiteService.CreateSite(c.Context(), params) + if err != nil { + return err + } + + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", newSite.ID)) +} + +func (s *SiteSettingsHandler) General(c fiber.Ctx) error { + site := c.Locals("site").(models.Site) + + return c.Render("sitesettings/general", fiber.Map{ "site": site, "tzones": sites.ListZones(), }) diff --git a/package-lock.json b/package-lock.json index c4f391c..2068fd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,8 @@ "dependencies": { "@hotwired/stimulus": "^3.2.2", "bootstrap": "^5.3.8", - "esbuild-sass-plugin": "^3.6.0" + "esbuild-sass-plugin": "^3.6.0", + "feather-icons": "^4.29.2" }, "devDependencies": { "esbuild": "0.27.3" @@ -783,6 +784,12 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/classnames": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==", + "license": "MIT" + }, "node_modules/colorjs.io": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz", @@ -790,6 +797,17 @@ "license": "MIT", "peer": true }, + "node_modules/core-js": { + "version": "3.49.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz", + "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==", + "hasInstallScript": true, + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/detect-libc": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", @@ -855,6 +873,16 @@ "sass-embedded": "^1.97.2" } }, + "node_modules/feather-icons": { + "version": "4.29.2", + "resolved": "https://registry.npmjs.org/feather-icons/-/feather-icons-4.29.2.tgz", + "integrity": "sha512-0TaCFTnBTVCz6U+baY2UJNKne5ifGh7sMG4ZC2LoBWCZdIyPa+y6UiR4lEYGws1JOFWdee8KAsAIvu0VcXqiqA==", + "license": "MIT", + "dependencies": { + "classnames": "^2.2.5", + "core-js": "^3.1.3" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -887,9 +915,9 @@ } }, "node_modules/immutable": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz", - "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", + "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", "license": "MIT" }, "node_modules/is-core-module": { diff --git a/package.json b/package.json index 64e6fca..5a786ac 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "dependencies": { "@hotwired/stimulus": "^3.2.2", "bootstrap": "^5.3.8", - "esbuild-sass-plugin": "^3.6.0" + "esbuild-sass-plugin": "^3.6.0", + "feather-icons": "^4.29.2" } } diff --git a/services/sites/services.go b/services/sites/services.go index 86e34b2..4585d03 100644 --- a/services/sites/services.go +++ b/services/sites/services.go @@ -9,6 +9,7 @@ import ( "github.com/gofiber/fiber/v3" "lmika.dev/lmika/weiro/models" "lmika.dev/lmika/weiro/providers/db" + "lmika.dev/pkg/modash/moslice" ) type Service struct { @@ -25,6 +26,22 @@ func (s *Service) HasUsersAsSites(ctx context.Context) (bool, error) { return s.db.HasUsersAndSites(ctx) } +func (s *Service) ListSites(ctx context.Context) ([]models.Site, error) { + user, ok := models.GetUser(ctx) + if !ok { + return nil, models.UserRequiredError + } + + sites, err := s.db.SelectSitesOwnedByUser(ctx, user.ID) + if err != nil { + return nil, err + } else if len(sites) == 0 { + return nil, errors.New("no sites found") + } + + return sites, nil +} + func (s *Service) BestSite(ctx context.Context, user models.User) (models.Site, error) { sites, err := s.db.SelectSitesOwnedByUser(ctx, user.ID) if err != nil { @@ -36,16 +53,20 @@ func (s *Service) BestSite(ctx context.Context, user models.User) (models.Site, return sites[0], nil } -type FirstRunRequest struct { - Username string `form:"username"` - Password1 string `form:"password1"` - Password2 string `form:"password2"` +type CreateSiteParams struct { SiteName string `form:"siteName"` SiteURL string `form:"siteUrl"` NetlifySiteID string `form:"netlifySiteId"` NetlifyAPIKey string `form:"netlifyAPIToken"` } +type FirstRunRequest struct { + CreateSiteParams + Username string `form:"username"` + Password1 string `form:"password1"` + Password2 string `form:"password2"` +} + func (frr FirstRunRequest) Validate() error { return validation.ValidateStruct(&frr, validation.Field(&frr.Username, validation.Required, validation.Match(models.ValidUserName)), @@ -76,16 +97,31 @@ func (s *Service) FirstRun(ctx context.Context, req FirstRunRequest) (newUser mo return newUser, newSite, err } + ctx = models.WithUser(ctx, newUser) + newSite, err = s.CreateSite(ctx, req.CreateSiteParams) + if err != nil { + return newUser, newSite, err + } + + return newUser, newSite, nil +} + +func (s *Service) CreateSite(ctx context.Context, req CreateSiteParams) (newSite models.Site, _ error) { + user, ok := models.GetUser(ctx) + if !ok { + return newSite, models.UserRequiredError + } + newSite = models.Site{ Title: defaultIfEmpty(req.SiteName, "New Site"), GUID: models.NewNanoID(), - OwnerID: newUser.ID, + OwnerID: user.ID, Timezone: "UTC", PostsPerPage: 10, Created: time.Now(), } if err := s.db.SaveSite(ctx, &newSite); err != nil { - return newUser, newSite, err + return newSite, err } hasNetlifyConfig := req.SiteURL != "" && req.NetlifySiteID != "" && req.NetlifyAPIKey != "" @@ -100,11 +136,11 @@ func (s *Service) FirstRun(ctx context.Context, req FirstRunRequest) (newUser mo TargetKey: req.NetlifyAPIKey, } if err := s.db.SavePublishTarget(ctx, &target); err != nil { - return newUser, newSite, err + return newSite, err } } - return newUser, newSite, nil + return newSite, nil } func (s *Service) GetSiteByID(ctx context.Context, siteID int64) (models.Site, error) { @@ -166,3 +202,17 @@ func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSetti return site, nil } + +func (s *Service) BestPubTarget(ctx context.Context, site models.Site) (models.SitePublishTarget, error) { + pubTargets, err := s.db.SelectPublishTargetsOfSite(ctx, site.ID) + if err != nil { + return models.SitePublishTarget{}, err + } + + enabledPubTargets := moslice.Filter(pubTargets, func(pubTarget models.SitePublishTarget) bool { return pubTarget.Enabled }) + if len(enabledPubTargets) == 0 { + return models.SitePublishTarget{}, errors.New("no publish targets found") + } + + return enabledPubTargets[0], nil +} diff --git a/views/_common/nav.html b/views/_common/nav.html index e9c0de7..5005326 100644 --- a/views/_common/nav.html +++ b/views/_common/nav.html @@ -29,7 +29,25 @@
    --> - +
    + + +
    +
    + {{ if .pubTarget }} + + + + {{ end }} +
    + {{ end }}
    diff --git a/models/pubmodel/sites.go b/models/pubmodel/sites.go index 38ba614..9f25b2f 100644 --- a/models/pubmodel/sites.go +++ b/models/pubmodel/sites.go @@ -6,6 +6,7 @@ import ( "iter" "lmika.dev/lmika/weiro/models" + "lmika.dev/pkg/modash/moslice" ) type Site struct { @@ -20,3 +21,7 @@ type Site struct { CategoriesOfPost func(ctx context.Context, postID int64) ([]*models.Category, error) Pages []*models.Page } + +func (s Site) NavItems() []*models.Page { + return moslice.Filter(s.Pages, func(p *models.Page) bool { return p.ShowInNav }) +} From 18f9f49c0a7dae500501208ef9153c7cbbb525ac Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Wed, 25 Mar 2026 21:09:57 +1100 Subject: [PATCH 28/40] Started UI for editing images --- assets/css/main.scss | 13 ++++-- assets/js/controllers/edit_upload.js | 59 ++++++++++++++++++++++++ assets/js/main.js | 2 + cmds/server.go | 1 + handlers/posts.go | 4 +- handlers/uploads.go | 21 +++++++++ package-lock.json | 67 +++++++++++++++++++++++++++- package.json | 3 +- views/posts/edit.html | 2 +- views/uploads/edit.html | 28 ++++++++++++ 10 files changed, 191 insertions(+), 9 deletions(-) create mode 100644 assets/js/controllers/edit_upload.js create mode 100644 views/uploads/edit.html diff --git a/assets/css/main.scss b/assets/css/main.scss index 2e0883a..addf5ce 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -31,19 +31,24 @@ $container-max-widths: ( font-size: 0.9rem; } -// Post form +// Large editor +// +// Used for edit canvases which take up the entire window -// Post edit page styling -.post-edit-page { +.large-editor { height: 100vh; } -.post-edit-page main { +.large-editor main { display: flex; flex-direction: column; overflow: hidden; } +// Post form + +// Post edit page styling + .post-edit-page .post-form { flex: 1; display: flex; diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js new file mode 100644 index 0000000..11ed862 --- /dev/null +++ b/assets/js/controllers/edit_upload.js @@ -0,0 +1,59 @@ +import Handlebars from "handlebars"; +import {Controller} from "@hotwired/stimulus"; + +const processorFrame = Handlebars.compile(` +
    +
    + {{name}} + X +
    +
    + {{{props}}} +
    +
    +`); + +const processors = [ + { + name: "shadow", + label: "Shadow", + template: Handlebars.compile(`This processor has no properties.`), + }, + { + name: "resize", + label: "Resize", + template: Handlebars.compile(` +
    + + +
    +
    + + +
    + `), + } +]; + +export default class UploadEditController extends Controller { + static targets = ['processList']; + + connect() { + this._rebuildProcessList(); + } + + _rebuildProcessList() { + let el = this.processListTarget; + + // TEMP + let cardTemplate = processors[0].template({ + "id": "shadow", + }); + let cardOuter = processorFrame({ + name: processors[0].label, + props: cardTemplate, + }); + el.innerHTML = cardOuter; + // END TEMP + } +} \ No newline at end of file diff --git a/assets/js/main.js b/assets/js/main.js index fcbe286..d3ff4c6 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -8,6 +8,7 @@ import LogoutController from "./controllers/logout"; import FirstRunController from "./controllers/firstrun"; import UploadController from "./controllers/upload"; import ShowUploadController from "./controllers/show_upload"; +import EditUploadController from "./controllers/edit_upload"; import PagelistController from "./controllers/pagelist"; window.Stimulus = Application.start() @@ -18,6 +19,7 @@ Stimulus.register("logout", LogoutController); Stimulus.register("first-run", FirstRunController); Stimulus.register("upload", UploadController); Stimulus.register("show-upload", ShowUploadController); +Stimulus.register("edit-upload", EditUploadController); Stimulus.register("pagelist", PagelistController); feather.replace(); \ No newline at end of file diff --git a/cmds/server.go b/cmds/server.go index 36e5923..06f7352 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -149,6 +149,7 @@ Starting weiro without any arguments will start the server. siteGroup.Post("/uploads/pending/:guid", uh.UploadPart) siteGroup.Post("/uploads/pending/:guid/finalize", uh.UploadComplete) siteGroup.Delete("/uploads/:uploadID", uh.Delete) + siteGroup.Get("/uploads/:uploadID/edit", uh.Edit) siteGroup.Get("/settings", ssh.General) siteGroup.Post("/settings", ssh.UpdateGeneral) diff --git a/handlers/posts.go b/handlers/posts.go index 3326533..0e491aa 100644 --- a/handlers/posts.go +++ b/handlers/posts.go @@ -75,7 +75,7 @@ func (ph PostsHandler) New(c fiber.Ctx) error { "post": p, "categories": cats, "selectedCategories": map[int64]bool{}, - "bodyClass": "post-edit-page", + "bodyClass": "large-editor", }) } @@ -116,7 +116,7 @@ func (ph PostsHandler) Edit(c fiber.Ctx) error { "post": post, "categories": cats, "selectedCategories": selectedCategories, - "bodyClass": "post-edit-page", + "bodyClass": "large-editor", }) })) } diff --git a/handlers/uploads.go b/handlers/uploads.go index fa2cb98..3553b09 100644 --- a/handlers/uploads.go +++ b/handlers/uploads.go @@ -162,3 +162,24 @@ func (uh UploadsHandler) UploadComplete(c fiber.Ctx) error { return c.Status(fiber.StatusAccepted).JSON(fiber.Map{}) } + +func (uh UploadsHandler) Edit(c fiber.Ctx) error { + uploadIDStr := c.Params("uploadID") + if uploadIDStr == "" { + return fiber.ErrBadRequest + } + uploadID, err := strconv.ParseInt(uploadIDStr, 10, 64) + if err != nil { + return fiber.ErrBadRequest + } + + upload, err := uh.UploadsService.FetchUpload(c.Context(), uploadID) + if err != nil { + return err + } + + return c.Render("uploads/edit", fiber.Map{ + "upload": upload, + "bodyClass": "large-editor", + }) +} diff --git a/package-lock.json b/package-lock.json index 2068fd3..eadf529 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,8 @@ "@hotwired/stimulus": "^3.2.2", "bootstrap": "^5.3.8", "esbuild-sass-plugin": "^3.6.0", - "feather-icons": "^4.29.2" + "feather-icons": "^4.29.2", + "handlebars": "^4.7.8" }, "devDependencies": { "esbuild": "0.27.3" @@ -892,6 +893,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -958,6 +980,21 @@ "node": ">=0.10.0" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "license": "MIT" + }, "node_modules/node-addon-api": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", @@ -1395,6 +1432,15 @@ "node": ">=14.0.0" } }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -1462,12 +1508,31 @@ "license": "0BSD", "peer": true }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/varint": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", "license": "MIT", "peer": true + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "license": "MIT" } } } diff --git a/package.json b/package.json index 5a786ac..3455630 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "@hotwired/stimulus": "^3.2.2", "bootstrap": "^5.3.8", "esbuild-sass-plugin": "^3.6.0", - "feather-icons": "^4.29.2" + "feather-icons": "^4.29.2", + "handlebars": "^4.7.8" } } diff --git a/views/posts/edit.html b/views/posts/edit.html index b9f5ea7..fbb94fa 100644 --- a/views/posts/edit.html +++ b/views/posts/edit.html @@ -1,5 +1,5 @@ {{ $isPublished := ne .post.State 1 }} -
    +
    +
    +
    +
    + {{ .upload.Upload.Alt }} +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + Actions go here +
    +
    \ No newline at end of file From 036b683eab6a9da873ea03c4ed6fd17cb5263497 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Wed, 25 Mar 2026 22:35:53 +1100 Subject: [PATCH 29/40] Have got session creation working --- assets/js/controllers/edit_upload.js | 25 +++++- cmds/server.go | 4 + handlers/imageedit.go | 67 ++++++++++++++++ models/errors.go | 1 + models/imgedit.go | 59 ++++++++++++++ services/imgedit/processing.go | 91 +++++++++++++++++++++ services/imgedit/service.go | 116 +++++++++++++++++++++++++++ services/imgedit/store.go | 66 +++++++++++++++ services/services.go | 4 + views/uploads/edit.html | 8 +- 10 files changed, 438 insertions(+), 3 deletions(-) create mode 100644 handlers/imageedit.go create mode 100644 models/imgedit.go create mode 100644 services/imgedit/processing.go create mode 100644 services/imgedit/service.go create mode 100644 services/imgedit/store.go diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js index 11ed862..35be2f7 100644 --- a/assets/js/controllers/edit_upload.js +++ b/assets/js/controllers/edit_upload.js @@ -36,10 +36,15 @@ const processors = [ ]; export default class UploadEditController extends Controller { - static targets = ['processList']; + static targets = ['processList', 'preview']; + static values = { + uploadId: Number, + siteId: Number, + }; connect() { this._rebuildProcessList(); + this._createSession(); } _rebuildProcessList() { @@ -56,4 +61,22 @@ export default class UploadEditController extends Controller { el.innerHTML = cardOuter; // END TEMP } + + async _createSession() { + try { + let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/`, { + method: 'POST', + body: JSON.stringify({ + "base_upload": this.uploadIdValue, + }) + }); + + this._state = await resp.json(); + this.previewTarget.src = this._state.preview_url; + + console.log("Session created"); + } catch (e) { + console.error(e); + } + } } \ No newline at end of file diff --git a/cmds/server.go b/cmds/server.go index 06f7352..5870a8a 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -111,6 +111,7 @@ Starting weiro without any arguments will start the server. lh := handlers.LoginHandler{Config: cfg, AuthService: svcs.Auth} ph := handlers.PostsHandler{PostService: svcs.Posts, CategoryService: svcs.Categories} uh := handlers.UploadsHandler{UploadsService: svcs.Uploads} + ieh := handlers.ImageEditHandlers{ImageEditService: svcs.ImageEdit} ssh := handlers.SiteSettingsHandler{SiteService: svcs.Sites} ch := handlers.CategoriesHandler{CategoryService: svcs.Categories} pgh := handlers.PagesHandler{PageService: svcs.Pages} @@ -151,6 +152,9 @@ Starting weiro without any arguments will start the server. siteGroup.Delete("/uploads/:uploadID", uh.Delete) siteGroup.Get("/uploads/:uploadID/edit", uh.Edit) + siteGroup.Post("/imageedit", ieh.Create) + siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview) + siteGroup.Get("/settings", ssh.General) siteGroup.Post("/settings", ssh.UpdateGeneral) diff --git a/handlers/imageedit.go b/handlers/imageedit.go new file mode 100644 index 0000000..551776a --- /dev/null +++ b/handlers/imageedit.go @@ -0,0 +1,67 @@ +package handlers + +import ( + "bufio" + "io" + "log" + "net/http" + + "github.com/gofiber/fiber/v3" + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/services/imgedit" +) + +type ImageEditHandlers struct { + ImageEditService *imgedit.Service +} + +func (ieh ImageEditHandlers) Create(c fiber.Ctx) error { + var req struct { + BaseUploadID int64 `json:"base_upload"` + } + + if err := c.Bind().JSON(&req); err != nil { + return err + } + + res, err := ieh.ImageEditService.NewSession(c.Context(), req.BaseUploadID) + if err != nil { + return err + } + + var resp = struct { + Session models.ImageEditSession `json:"session"` + PreviewURL string `json:"preview_url"` + }{ + Session: res, + PreviewURL: res.PreviewURL(), + } + + return c.Status(http.StatusCreated).JSON(resp) +} + +func (ieh ImageEditHandlers) Preview(c fiber.Ctx) error { + log.Printf("Previewing image edit session %v/%v", c.Params("sessionID"), c.Params("versionID")) + sessionID := c.Params("sessionID") + versionID := c.Params("versionID") + + mimeTime, rw, err := ieh.ImageEditService.LoadImageVersion(c.Context(), sessionID, versionID) + if err != nil { + return err + } + + c.Set("Content-Type", mimeTime) + c.Status(http.StatusOK) + return c.SendStreamWriter(func(w *bufio.Writer) { + rw, err := rw() + if err != nil { + return + } + defer rw.Close() + + _, err = io.Copy(w, rw) + if err != nil { + return + } + }) +} diff --git a/models/errors.go b/models/errors.go index 3efadbc..2c4ae68 100644 --- a/models/errors.go +++ b/models/errors.go @@ -8,3 +8,4 @@ var NotFoundError = errors.New("not found") var SiteRequiredError = errors.New("site required") var DeleteDebounceError = errors.New("permanent delete too soon, try again in a few seconds") var SlugConflictError = errors.New("a record with this slug already exists") +var UnsupportedImageFormat = errors.New("unsupported image format") diff --git a/models/imgedit.go b/models/imgedit.go new file mode 100644 index 0000000..88ec8be --- /dev/null +++ b/models/imgedit.go @@ -0,0 +1,59 @@ +package models + +import ( + "crypto/md5" + "encoding/json" + "fmt" + "strings" + "time" +) + +type ImageEditSession struct { + GUID string `json:"guid"` + SiteID int64 `json:"siteId"` + UserID int64 `json:"userId"` + BaseUploadID int64 `json:"baseUploadId"` + ImageExt string `json:"imageExt"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` + Processors []ImageEditProcessor `json:"processors"` +} + +func (ieh ImageEditSession) PreviewURL() string { + return fmt.Sprintf("/sites/%v/imageedit/%v/preview/%v", ieh.SiteID, ieh.GUID, ieh.Processors[len(ieh.Processors)-1].VersionID) +} + +func (ieh *ImageEditSession) RecalcVersionIDs() { + for i, p := range ieh.Processors { + if i == 0 { + p.SetVersionID("") + } else { + p.SetVersionID(ieh.Processors[i-1].VersionID) + } + + ieh.Processors[i] = p + } +} + +type ImageEditProcessor struct { + Type string `json:"type"` + Props json.RawMessage `json:"props"` + + // VersionID is a unique hash of the particular processor. This includes the version ID of the previous processor, + // thereby causing a change of one processor to affect the version IDs of processors down the line. + VersionID string `json:"versionId"` +} + +func (ieh *ImageEditProcessor) SetVersionID(previousVersionID string) { + var sb strings.Builder + sb.WriteString(previousVersionID) + sb.WriteString("-") + sb.WriteString(ieh.Type) + sb.WriteString("-") + sb.WriteString(string(ieh.Props)) + ieh.VersionID = fmt.Sprintf("%x", md5.Sum([]byte(sb.String()))) +} + +type CopyUploadProps struct { + UploadID int64 `json:"uploadId"` +} diff --git a/services/imgedit/processing.go b/services/imgedit/processing.go new file mode 100644 index 0000000..83e58a9 --- /dev/null +++ b/services/imgedit/processing.go @@ -0,0 +1,91 @@ +package imgedit + +import ( + "context" + "encoding/json" + "fmt" + "image" + "os" + "path/filepath" + + "github.com/disintegration/imaging" + "lmika.dev/lmika/weiro/models" +) + +func (s *Service) reprocess(ctx context.Context, session models.ImageEditSession) (imageSource, error) { + var img imageSource + + for _, p := range session.Processors { + // Check if there's currently a cached image of this processor + cachedImageFile := filepath.Join(s.scratchDir, session.GUID, fmt.Sprintf("%v.%v", p.VersionID, session.ImageExt)) + if s, err := os.Stat(cachedImageFile); err == nil && !s.IsDir() { + img = fileImageSource(cachedImageFile) + continue + } + + // Need to process the image + var srcImg image.Image + if img != nil { + var err error + srcImg, err = img.image() + if err != nil { + return nil, err + } + } + + resImg, err := s.processImage(ctx, srcImg, p) + if err != nil { + return nil, err + } + + // Cache the processed image + if err := imaging.Save(resImg, cachedImageFile); err != nil { + return nil, err + } + img = imageImageSource{resImg} + } + + return img, nil +} + +func (s *Service) processImage(ctx context.Context, srcImg image.Image, processor models.ImageEditProcessor) (image.Image, error) { + switch processor.Type { + case "copy-upload": + var p models.CopyUploadProps + if err := json.Unmarshal(processor.Props, &p); err != nil { + return nil, err + } + + _, rc, err := s.uploadService.OpenUpload(ctx, p.UploadID) + if err != nil { + return nil, err + } + + f, err := rc() + if err != nil { + return nil, err + } + defer f.Close() + + return imaging.Decode(f) + } + return nil, fmt.Errorf("unknown processor type: %v", processor.Type) +} + +type imageSource interface { + image() (image.Image, error) +} + +type fileImageSource string + +func (f fileImageSource) image() (image.Image, error) { + return imaging.Open(string(f)) +} + +type imageImageSource struct { + img image.Image +} + +func (i imageImageSource) image() (image.Image, error) { + return i.img, nil +} diff --git a/services/imgedit/service.go b/services/imgedit/service.go new file mode 100644 index 0000000..0b4d080 --- /dev/null +++ b/services/imgedit/service.go @@ -0,0 +1,116 @@ +package imgedit + +import ( + "context" + "encoding/json" + "io" + "time" + + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/services/uploads" +) + +type Service struct { + scratchDir string + uploadService *uploads.Service + sessionStore *sessionStore +} + +func New( + uploadService *uploads.Service, + scratchDir string, +) *Service { + return &Service{ + scratchDir: scratchDir, + uploadService: uploadService, + sessionStore: &sessionStore{baseDir: scratchDir}, + } +} + +func (s *Service) LoadImageVersion(ctx context.Context, sessionID string, versionID string) (mimeType string, rw func() (io.ReadCloser, error), err error) { + site, user, err := s.fetchSiteAndUser(ctx) + if err != nil { + return "", nil, err + } + + session, err := s.sessionStore.get(sessionID) + if err != nil { + return "", nil, err + } else if session.SiteID != site.ID || session.UserID != user.ID { + return "", nil, models.PermissionError + } + + return s.sessionStore.getImage(session, versionID+"."+session.ImageExt) +} + +func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (models.ImageEditSession, error) { + site, user, err := s.fetchSiteAndUser(ctx) + if err != nil { + return models.ImageEditSession{}, err + } + + upload, _, err := s.uploadService.OpenUpload(ctx, baseUploadID) + if err != nil { + return models.ImageEditSession{}, err + } + + var ext string + switch upload.MIMEType { + case "image/jpeg": + ext = "jpg" + case "image/png": + ext = "png" + default: + return models.ImageEditSession{}, models.UnsupportedImageFormat + } + + newSession := models.ImageEditSession{ + GUID: models.NewNanoID(), + SiteID: site.ID, + UserID: user.ID, + BaseUploadID: baseUploadID, + ImageExt: ext, + CreatedAt: time.Now().UTC(), + UpdatedAt: time.Now().UTC(), + Processors: []models.ImageEditProcessor{ + { + Type: "copy-upload", + Props: mustToJSON(models.CopyUploadProps{UploadID: baseUploadID}), + }, + }, + } + + newSession.RecalcVersionIDs() + if err := s.sessionStore.create(newSession); err != nil { + return models.ImageEditSession{}, err + } + + if _, err := s.reprocess(ctx, newSession); err != nil { + return models.ImageEditSession{}, err + } + + return newSession, nil +} + +func (s *Service) fetchSiteAndUser(ctx context.Context) (models.Site, models.User, error) { + user, ok := models.GetUser(ctx) + if !ok { + return models.Site{}, models.User{}, models.UserRequiredError + } + + site, ok := models.GetSite(ctx) + if !ok { + return models.Site{}, models.User{}, models.SiteRequiredError + } + + if site.OwnerID != user.ID { + return models.Site{}, models.User{}, models.PermissionError + } + + return site, user, nil +} + +func mustToJSON(a any) json.RawMessage { + b, _ := json.Marshal(a) + return b +} diff --git a/services/imgedit/store.go b/services/imgedit/store.go new file mode 100644 index 0000000..b697faa --- /dev/null +++ b/services/imgedit/store.go @@ -0,0 +1,66 @@ +package imgedit + +import ( + "encoding/json" + "io" + "os" + "path/filepath" + + "lmika.dev/lmika/weiro/models" +) + +type sessionStore struct { + baseDir string +} + +func (ss *sessionStore) create(newSession models.ImageEditSession) error { + sessionMeta, err := json.Marshal(newSession) + if err != nil { + return err + } + + if err := os.MkdirAll(filepath.Join(ss.baseDir, newSession.GUID), 0755); err != nil { + return err + } + if err := os.WriteFile(filepath.Join(ss.baseDir, newSession.GUID, "session.json"), sessionMeta, 0644); err != nil { + return err + } + return nil +} + +func (ss *sessionStore) get(guid string) (models.ImageEditSession, error) { + sessionDataBts, err := os.ReadFile(filepath.Join(ss.baseDir, guid, "session.json")) + if err != nil { + return models.ImageEditSession{}, err + } + + sessionData := models.ImageEditSession{} + if err := json.Unmarshal(sessionDataBts, &sessionData); err != nil { + return models.ImageEditSession{}, err + } + + return sessionData, nil +} + +func (ss *sessionStore) getImage(session models.ImageEditSession, imageFilename string) (string, func() (io.ReadCloser, error), error) { + fullPath := filepath.Join(ss.baseDir, session.GUID, imageFilename) + if s, err := os.Stat(fullPath); err != nil { + return "", nil, err + } else if s.IsDir() { + return "", nil, os.ErrNotExist + } + + var mimeType string + switch filepath.Ext(imageFilename) { + case ".jpg", ".jpeg": + mimeType = "image/jpeg" + case ".png": + mimeType = "image/png" + default: + return "", nil, models.UnsupportedImageFormat + } + + return mimeType, func() (io.ReadCloser, error) { + return os.Open(fullPath) + }, nil +} diff --git a/services/services.go b/services/services.go index 852dea3..ab1a4ca 100644 --- a/services/services.go +++ b/services/services.go @@ -8,6 +8,7 @@ import ( "lmika.dev/lmika/weiro/providers/uploadfiles" "lmika.dev/lmika/weiro/services/auth" "lmika.dev/lmika/weiro/services/categories" + "lmika.dev/lmika/weiro/services/imgedit" "lmika.dev/lmika/weiro/services/pages" "lmika.dev/lmika/weiro/services/posts" "lmika.dev/lmika/weiro/services/publisher" @@ -23,6 +24,7 @@ type Services struct { Posts *posts.Service Sites *sites.Service Uploads *uploads.Service + ImageEdit *imgedit.Service Categories *categories.Service Pages *pages.Service } @@ -41,6 +43,7 @@ func New(cfg config.Config) (*Services, error) { postService := posts.New(dbp, publisherQueue) siteService := sites.New(dbp) uploadService := uploads.New(dbp, ufp, filepath.Join(cfg.ScratchDir, "uploads", "pending")) + imageEditService := imgedit.New(uploadService, filepath.Join(cfg.ScratchDir, "imageedit")) categoriesService := categories.New(dbp, publisherQueue) pagesService := pages.New(dbp, publisherQueue) @@ -52,6 +55,7 @@ func New(cfg config.Config) (*Services, error) { Posts: postService, Sites: siteService, Uploads: uploadService, + ImageEdit: imageEditService, Categories: categoriesService, Pages: pagesService, }, nil diff --git a/views/uploads/edit.html b/views/uploads/edit.html index 18ff35f..3137e00 100644 --- a/views/uploads/edit.html +++ b/views/uploads/edit.html @@ -1,8 +1,12 @@
    -
    +
    - {{ .upload.Upload.Alt }} + {{ .upload.Upload.Alt }}
    From 599c72d465561a4f94b247fc0895dcfe05f8dec2 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Thu, 26 Mar 2026 21:16:50 +1100 Subject: [PATCH 30/40] Have got the processor plumbing working --- assets/js/controllers/edit_upload.js | 29 ++++++++++ cmds/server.go | 1 + handlers/imageedit.go | 34 +++++++++-- handlers/index.go | 8 +++ handlers/middleware/site.go | 4 ++ models/imgedit.go | 3 + services/imgedit/processing.go | 7 ++- services/imgedit/service.go | 87 ++++++++++++++++++++-------- services/imgedit/shadow.go | 35 +++++++++++ services/imgedit/store.go | 12 ++-- views/uploads/edit.html | 4 +- 11 files changed, 185 insertions(+), 39 deletions(-) create mode 100644 services/imgedit/shadow.go diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js index 35be2f7..65b0234 100644 --- a/assets/js/controllers/edit_upload.js +++ b/assets/js/controllers/edit_upload.js @@ -47,6 +47,13 @@ export default class UploadEditController extends Controller { this._createSession(); } + async addProcessor(ev) { + ev.preventDefault(); + await this._addProcessor({ + type: "shadow" + }); + } + _rebuildProcessList() { let el = this.processListTarget; @@ -66,6 +73,10 @@ export default class UploadEditController extends Controller { try { let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/`, { method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, body: JSON.stringify({ "base_upload": this.uploadIdValue, }) @@ -79,4 +90,22 @@ export default class UploadEditController extends Controller { console.error(e); } } + + async _addProcessor(processor) { + try { + let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/processors`, { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, + body: JSON.stringify(processor) + }); + + this._state = await resp.json(); + this.previewTarget.src = this._state.preview_url; + } catch (e) { + console.error(e); + } + } } \ No newline at end of file diff --git a/cmds/server.go b/cmds/server.go index 5870a8a..d776cf3 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -153,6 +153,7 @@ Starting weiro without any arguments will start the server. siteGroup.Get("/uploads/:uploadID/edit", uh.Edit) siteGroup.Post("/imageedit", ieh.Create) + siteGroup.Post("/imageedit/:sessionID/processors", ieh.AddProcessor) siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview) siteGroup.Get("/settings", ssh.General) diff --git a/handlers/imageedit.go b/handlers/imageedit.go index 551776a..1ca9817 100644 --- a/handlers/imageedit.go +++ b/handlers/imageedit.go @@ -15,6 +15,11 @@ type ImageEditHandlers struct { ImageEditService *imgedit.Service } +type sessionResponse struct { + Session *models.ImageEditSession `json:"session"` + PreviewURL string `json:"preview_url"` +} + func (ieh ImageEditHandlers) Create(c fiber.Ctx) error { var req struct { BaseUploadID int64 `json:"base_upload"` @@ -29,10 +34,7 @@ func (ieh ImageEditHandlers) Create(c fiber.Ctx) error { return err } - var resp = struct { - Session models.ImageEditSession `json:"session"` - PreviewURL string `json:"preview_url"` - }{ + var resp = sessionResponse{ Session: res, PreviewURL: res.PreviewURL(), } @@ -65,3 +67,27 @@ func (ieh ImageEditHandlers) Preview(c fiber.Ctx) error { } }) } + +func (ieh ImageEditHandlers) AddProcessor(c fiber.Ctx) error { + sessionID := c.Params("sessionID") + if sessionID == "" { + log.Println("No session ID") + return fiber.ErrBadRequest + } + + var req imgedit.AddProcessorReq + if err := c.Bind().Body(&req); err != nil { + log.Printf("Failed to parse request body: %v", err) + return fiber.ErrBadRequest + } + + res, err := ieh.ImageEditService.AddProcessor(c.Context(), sessionID, req) + if err != nil { + return err + } + + return c.Status(http.StatusOK).JSON(sessionResponse{ + Session: res, + PreviewURL: res.PreviewURL(), + }) +} diff --git a/handlers/index.go b/handlers/index.go index 6062237..410c347 100644 --- a/handlers/index.go +++ b/handlers/index.go @@ -2,6 +2,7 @@ package handlers import ( "fmt" + "log" "net/url" "regexp" @@ -37,6 +38,13 @@ func (h IndexHandler) Index(c fiber.Ctx) error { } } + sess := session.FromContext(c) + lastSiteID, ok := sess.Get("last_site_id").(int64) + log.Printf("last site id: %v", lastSiteID) + if ok { + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", lastSiteID)) + } + site, err := h.SiteService.BestSite(c.Context(), user) if err != nil { return err diff --git a/handlers/middleware/site.go b/handlers/middleware/site.go index 6f47430..1d3ddf2 100644 --- a/handlers/middleware/site.go +++ b/handlers/middleware/site.go @@ -5,6 +5,7 @@ import ( "emperror.dev/errors" "github.com/gofiber/fiber/v3" + "github.com/gofiber/fiber/v3/middleware/session" "lmika.dev/lmika/weiro/models" "lmika.dev/lmika/weiro/providers/db" "lmika.dev/lmika/weiro/services/sites" @@ -41,6 +42,9 @@ func RequiresSite(sites *sites.Service) func(c fiber.Ctx) error { } c.Locals("allSites", sitesOwnedByUser) + sess := session.FromContext(c) + sess.Set("last_site_id", siteID) + if pubTargets, err := sites.BestPubTarget(c.Context(), site); err == nil { c.Locals("pubTarget", pubTargets) } diff --git a/models/imgedit.go b/models/imgedit.go index 88ec8be..b954402 100644 --- a/models/imgedit.go +++ b/models/imgedit.go @@ -36,6 +36,7 @@ func (ieh *ImageEditSession) RecalcVersionIDs() { } type ImageEditProcessor struct { + ID string `json:"id"` Type string `json:"type"` Props json.RawMessage `json:"props"` @@ -46,6 +47,8 @@ type ImageEditProcessor struct { func (ieh *ImageEditProcessor) SetVersionID(previousVersionID string) { var sb strings.Builder + sb.WriteString(ieh.ID) + sb.WriteString("-") sb.WriteString(previousVersionID) sb.WriteString("-") sb.WriteString(ieh.Type) diff --git a/services/imgedit/processing.go b/services/imgedit/processing.go index 83e58a9..107bcb3 100644 --- a/services/imgedit/processing.go +++ b/services/imgedit/processing.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "image" + "image/color" "os" "path/filepath" @@ -12,7 +13,7 @@ import ( "lmika.dev/lmika/weiro/models" ) -func (s *Service) reprocess(ctx context.Context, session models.ImageEditSession) (imageSource, error) { +func (s *Service) reprocess(ctx context.Context, session *models.ImageEditSession) (imageSource, error) { var img imageSource for _, p := range session.Processors { @@ -68,6 +69,10 @@ func (s *Service) processImage(ctx context.Context, srcImg image.Image, processo defer f.Close() return imaging.Decode(f) + case "shadow": + shadow := makeBoxShadow(srcImg, color.Black, 4, 10, 0) + composit := imaging.OverlayCenter(shadow, srcImg, 1.0) + return composit, nil } return nil, fmt.Errorf("unknown processor type: %v", processor.Type) } diff --git a/services/imgedit/service.go b/services/imgedit/service.go index 0b4d080..fa6b795 100644 --- a/services/imgedit/service.go +++ b/services/imgedit/service.go @@ -27,31 +27,15 @@ func New( } } -func (s *Service) LoadImageVersion(ctx context.Context, sessionID string, versionID string) (mimeType string, rw func() (io.ReadCloser, error), err error) { +func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (*models.ImageEditSession, error) { site, user, err := s.fetchSiteAndUser(ctx) if err != nil { - return "", nil, err - } - - session, err := s.sessionStore.get(sessionID) - if err != nil { - return "", nil, err - } else if session.SiteID != site.ID || session.UserID != user.ID { - return "", nil, models.PermissionError - } - - return s.sessionStore.getImage(session, versionID+"."+session.ImageExt) -} - -func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (models.ImageEditSession, error) { - site, user, err := s.fetchSiteAndUser(ctx) - if err != nil { - return models.ImageEditSession{}, err + return nil, err } upload, _, err := s.uploadService.OpenUpload(ctx, baseUploadID) if err != nil { - return models.ImageEditSession{}, err + return nil, err } var ext string @@ -61,7 +45,7 @@ func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (models.Im case "image/png": ext = "png" default: - return models.ImageEditSession{}, models.UnsupportedImageFormat + return nil, models.UnsupportedImageFormat } newSession := models.ImageEditSession{ @@ -74,6 +58,7 @@ func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (models.Im UpdatedAt: time.Now().UTC(), Processors: []models.ImageEditProcessor{ { + ID: models.NewNanoID(), Type: "copy-upload", Props: mustToJSON(models.CopyUploadProps{UploadID: baseUploadID}), }, @@ -81,15 +66,67 @@ func (s *Service) NewSession(ctx context.Context, baseUploadID int64) (models.Im } newSession.RecalcVersionIDs() - if err := s.sessionStore.create(newSession); err != nil { - return models.ImageEditSession{}, err + if err := s.sessionStore.save(&newSession); err != nil { + return nil, err } - if _, err := s.reprocess(ctx, newSession); err != nil { - return models.ImageEditSession{}, err + if _, err := s.reprocess(ctx, &newSession); err != nil { + return nil, err } - return newSession, nil + return &newSession, nil +} + +func (s *Service) LoadImageVersion(ctx context.Context, sessionID string, versionID string) (mimeType string, rw func() (io.ReadCloser, error), err error) { + session, err := s.loadAndVerifySession(ctx, sessionID) + if err != nil { + return "", nil, err + } + + return s.sessionStore.getImage(session, versionID+"."+session.ImageExt) +} + +type AddProcessorReq struct { + Type string `json:"type"` +} + +func (s *Service) AddProcessor(ctx context.Context, sessionID string, req AddProcessorReq) (*models.ImageEditSession, error) { + session, err := s.loadAndVerifySession(ctx, sessionID) + if err != nil { + return nil, err + } + + // TODO: verify processor, etc. + session.Processors = append(session.Processors, models.ImageEditProcessor{ + ID: models.NewNanoID(), + Type: req.Type, + }) + + session.RecalcVersionIDs() + if err := s.sessionStore.save(session); err != nil { + return nil, err + } + + if _, err := s.reprocess(ctx, session); err != nil { + return nil, err + } + + return session, nil +} + +func (s *Service) loadAndVerifySession(ctx context.Context, sessionID string) (*models.ImageEditSession, error) { + site, user, err := s.fetchSiteAndUser(ctx) + if err != nil { + return nil, err + } + + session, err := s.sessionStore.get(sessionID) + if err != nil { + return nil, err + } else if session.SiteID != site.ID || session.UserID != user.ID { + return nil, models.PermissionError + } + return session, nil } func (s *Service) fetchSiteAndUser(ctx context.Context) (models.Site, models.User, error) { diff --git a/services/imgedit/shadow.go b/services/imgedit/shadow.go new file mode 100644 index 0000000..4a308d0 --- /dev/null +++ b/services/imgedit/shadow.go @@ -0,0 +1,35 @@ +package imgedit + +import ( + "image" + "image/color" + + "github.com/disintegration/imaging" +) + +func makeBoxShadow(maskImg image.Image, shadowColor color.Color, sigma float64, shadowMargin, offsetY int) image.Image { + w, h := maskImg.Bounds().Dx(), maskImg.Bounds().Dy() + cr, cg, cb, _ := shadowColor.RGBA() + cr8, cg8, cb8 := uint8(cr>>8), uint8(cg>>8), uint8(cb>>8) + + // New box image + backing := image.NewNRGBA(image.Rect(0, 0, w+shadowMargin*2, h+shadowMargin*2+offsetY)) + newImg := image.NewNRGBA(image.Rect(0, 0, w+shadowMargin*2, h+shadowMargin*2+offsetY)) + for x := 0; x < w+shadowMargin*2; x++ { + for y := 0; y < h+shadowMargin*2; y++ { + var c = color.NRGBA{R: 255, G: 255, B: 255, A: 0} + if x >= shadowMargin-4 && y >= shadowMargin-4 && x <= w+shadowMargin+4 && y <= h+shadowMargin+4 { + _, _, _, a := maskImg.At(x-shadowMargin, y-shadowMargin).RGBA() + c = color.NRGBA{R: cr8, G: cg8, B: cb8, A: uint8(a >> 8)} + } + backing.SetNRGBA(x, y, color.NRGBA{R: 255, G: 255, B: 255, A: 0}) + newImg.SetNRGBA(x, y+offsetY, c) + } + } + + // Blur + blurredImage := imaging.Blur(newImg, sigma) + backing = imaging.OverlayCenter(backing, blurredImage, 0.6) + + return backing +} diff --git a/services/imgedit/store.go b/services/imgedit/store.go index b697faa..7638dbe 100644 --- a/services/imgedit/store.go +++ b/services/imgedit/store.go @@ -13,7 +13,7 @@ type sessionStore struct { baseDir string } -func (ss *sessionStore) create(newSession models.ImageEditSession) error { +func (ss *sessionStore) save(newSession *models.ImageEditSession) error { sessionMeta, err := json.Marshal(newSession) if err != nil { return err @@ -28,21 +28,21 @@ func (ss *sessionStore) create(newSession models.ImageEditSession) error { return nil } -func (ss *sessionStore) get(guid string) (models.ImageEditSession, error) { +func (ss *sessionStore) get(guid string) (*models.ImageEditSession, error) { sessionDataBts, err := os.ReadFile(filepath.Join(ss.baseDir, guid, "session.json")) if err != nil { - return models.ImageEditSession{}, err + return nil, err } sessionData := models.ImageEditSession{} if err := json.Unmarshal(sessionDataBts, &sessionData); err != nil { - return models.ImageEditSession{}, err + return nil, err } - return sessionData, nil + return &sessionData, nil } -func (ss *sessionStore) getImage(session models.ImageEditSession, imageFilename string) (string, func() (io.ReadCloser, error), error) { +func (ss *sessionStore) getImage(session *models.ImageEditSession, imageFilename string) (string, func() (io.ReadCloser, error), error) { fullPath := filepath.Join(ss.baseDir, session.GUID, imageFilename) if s, err := os.Stat(fullPath); err != nil { return "", nil, err diff --git a/views/uploads/edit.html b/views/uploads/edit.html index 3137e00..5c8cc2d 100644 --- a/views/uploads/edit.html +++ b/views/uploads/edit.html @@ -17,9 +17,7 @@ Add Processor
    From 2d42a0ef909859a7b0fdd6fe249ab836103562c0 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Thu, 26 Mar 2026 21:44:20 +1100 Subject: [PATCH 31/40] Have got removing parameters working --- assets/js/controllers/edit_upload.js | 77 ++++++++++++++++++++-------- cmds/server.go | 1 + handlers/imageedit.go | 22 ++++++++ services/imgedit/processing.go | 3 ++ services/imgedit/service.go | 20 ++++++++ 5 files changed, 103 insertions(+), 20 deletions(-) diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js index 65b0234..929b905 100644 --- a/assets/js/controllers/edit_upload.js +++ b/assets/js/controllers/edit_upload.js @@ -5,7 +5,10 @@ const processorFrame = Handlebars.compile(`
    {{name}} - X + X
    {{{props}}} @@ -13,14 +16,12 @@ const processorFrame = Handlebars.compile(`
    `); -const processors = [ - { - name: "shadow", +const processorUIs = { + "shadow": { label: "Shadow", template: Handlebars.compile(`This processor has no properties.`), }, - { - name: "resize", + "resize": { label: "Resize", template: Handlebars.compile(`
    @@ -32,8 +33,8 @@ const processors = [
    `), - } -]; + }, +}; export default class UploadEditController extends Controller { static targets = ['processList', 'preview']; @@ -54,19 +55,33 @@ export default class UploadEditController extends Controller { }); } + async removeProcessor(ev) { + ev.preventDefault(); + let id = ev.params.id; + console.log(ev.params); + await this._removeProcessor(id); + } + _rebuildProcessList() { let el = this.processListTarget; - // TEMP - let cardTemplate = processors[0].template({ - "id": "shadow", - }); - let cardOuter = processorFrame({ - name: processors[0].label, - props: cardTemplate, - }); - el.innerHTML = cardOuter; - // END TEMP + if ((!this._state) || (!this._state.session) || (!this._state.session.processors)) { + return; + } + + el.innerHTML = ""; + for (let p of this._state.session.processors) { + let ui = processorUIs[p.type]; + if (!ui) { + continue; + } + let cardOuter = processorFrame({ + id: p.id, + name: ui.label, + props: ui.template(p), + }); + el.innerHTML += cardOuter; + } } async _createSession() { @@ -83,9 +98,9 @@ export default class UploadEditController extends Controller { }); this._state = await resp.json(); - this.previewTarget.src = this._state.preview_url; - console.log("Session created"); + this._rebuildProcessList(); + this.previewTarget.src = this._state.preview_url; } catch (e) { console.error(e); } @@ -103,9 +118,31 @@ export default class UploadEditController extends Controller { }); this._state = await resp.json(); + + this._rebuildProcessList(); this.previewTarget.src = this._state.preview_url; } catch (e) { console.error(e); } } + + async _removeProcessor(processorID) { + await this._doReturningState(async () => { + return (await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/processors/${processorID}`, { + method: 'DELETE', + })).json(); + }) + } + + async _doReturningState(fn) { + try { + this._state = await fn(); + + this._rebuildProcessList(); + this.previewTarget.src = this._state.preview_url; + } catch (e) { + console.error(e); + } + + } } \ No newline at end of file diff --git a/cmds/server.go b/cmds/server.go index d776cf3..515f7a5 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -154,6 +154,7 @@ Starting weiro without any arguments will start the server. siteGroup.Post("/imageedit", ieh.Create) siteGroup.Post("/imageedit/:sessionID/processors", ieh.AddProcessor) + siteGroup.Delete("/imageedit/:sessionID/processors/:processorID", ieh.DeleteProcessor) siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview) siteGroup.Get("/settings", ssh.General) diff --git a/handlers/imageedit.go b/handlers/imageedit.go index 1ca9817..8026c53 100644 --- a/handlers/imageedit.go +++ b/handlers/imageedit.go @@ -91,3 +91,25 @@ func (ieh ImageEditHandlers) AddProcessor(c fiber.Ctx) error { PreviewURL: res.PreviewURL(), }) } + +func (ieh ImageEditHandlers) DeleteProcessor(c fiber.Ctx) error { + sessionID := c.Params("sessionID") + if sessionID == "" { + return fiber.ErrBadRequest + } + + processorID := c.Params("processorID") + if processorID == "" { + return fiber.ErrBadRequest + } + + res, err := ieh.ImageEditService.DeleteProcessor(c.Context(), sessionID, processorID) + if err != nil { + return err + } + + return c.Status(http.StatusOK).JSON(sessionResponse{ + Session: res, + PreviewURL: res.PreviewURL(), + }) +} diff --git a/services/imgedit/processing.go b/services/imgedit/processing.go index 107bcb3..68f8b9d 100644 --- a/services/imgedit/processing.go +++ b/services/imgedit/processing.go @@ -6,6 +6,7 @@ import ( "fmt" "image" "image/color" + "log" "os" "path/filepath" @@ -46,6 +47,8 @@ func (s *Service) reprocess(ctx context.Context, session *models.ImageEditSessio img = imageImageSource{resImg} } + log.Printf("result of processed image: %T", img) + return img, nil } diff --git a/services/imgedit/service.go b/services/imgedit/service.go index fa6b795..97603a8 100644 --- a/services/imgedit/service.go +++ b/services/imgedit/service.go @@ -8,6 +8,7 @@ import ( "lmika.dev/lmika/weiro/models" "lmika.dev/lmika/weiro/services/uploads" + "lmika.dev/pkg/modash/moslice" ) type Service struct { @@ -114,6 +115,25 @@ func (s *Service) AddProcessor(ctx context.Context, sessionID string, req AddPro return session, nil } +func (s *Service) DeleteProcessor(ctx context.Context, sessionID, processorID string) (*models.ImageEditSession, error) { + session, err := s.loadAndVerifySession(ctx, sessionID) + if err != nil { + return nil, err + } + + session.Processors = moslice.Filter(session.Processors, func(p models.ImageEditProcessor) bool { return p.ID != processorID }) + session.RecalcVersionIDs() + if err := s.sessionStore.save(session); err != nil { + return nil, err + } + + if _, err := s.reprocess(ctx, session); err != nil { + return nil, err + } + + return session, nil +} + func (s *Service) loadAndVerifySession(ctx context.Context, sessionID string) (*models.ImageEditSession, error) { site, user, err := s.fetchSiteAndUser(ctx) if err != nil { From 488942db2e55d673c4e44893e17f1f54f3a8a894 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Thu, 26 Mar 2026 22:14:57 +1100 Subject: [PATCH 32/40] Started working on proper parameters --- assets/js/controllers/edit_upload.js | 13 ++++++-- services/imgedit/processing.go | 48 +++++++++++++++++++++++++--- services/imgedit/service.go | 18 +++++++++-- 3 files changed, 69 insertions(+), 10 deletions(-) diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js index 929b905..f1d472a 100644 --- a/assets/js/controllers/edit_upload.js +++ b/assets/js/controllers/edit_upload.js @@ -1,6 +1,10 @@ import Handlebars from "handlebars"; import {Controller} from "@hotwired/stimulus"; +Handlebars.registerHelper("submit_on", function (id, event) { + return `data-action="${event}->edit-upload#updateProcessor" data-edit-upload-id-param="${id}"` +}); + const processorFrame = Handlebars.compile(`
    @@ -11,7 +15,7 @@ const processorFrame = Handlebars.compile(` >X
    - {{{props}}} + {{{props}}}
    `); @@ -19,7 +23,12 @@ const processorFrame = Handlebars.compile(` const processorUIs = { "shadow": { label: "Shadow", - template: Handlebars.compile(`This processor has no properties.`), + template: Handlebars.compile(` +
    + + +
    + `), }, "resize": { label: "Resize", diff --git a/services/imgedit/processing.go b/services/imgedit/processing.go index 68f8b9d..378ead5 100644 --- a/services/imgedit/processing.go +++ b/services/imgedit/processing.go @@ -14,6 +14,34 @@ import ( "lmika.dev/lmika/weiro/models" ) +type imageProcessor struct { + newParams func() any + processImage func(ctx context.Context, srcImg image.Image, params any) (image.Image, error) +} + +type shadowProcessorArgs struct { + Color string `json:"color"` + OffsetY int `json:"offset_y"` +} + +var processors = map[string]imageProcessor{ + "shadow": { + newParams: func() any { + return &shadowProcessorArgs{ + Color: "#000000", + OffsetY: 0, + } + }, + processImage: func(ctx context.Context, srcImg image.Image, params any) (image.Image, error) { + p := params.(*shadowProcessorArgs) + + shadow := makeBoxShadow(srcImg, color.Black, 4, 10, p.OffsetY) + composit := imaging.OverlayCenter(shadow, srcImg, 1.0) + return composit, nil + }, + }, +} + func (s *Service) reprocess(ctx context.Context, session *models.ImageEditSession) (imageSource, error) { var img imageSource @@ -72,12 +100,22 @@ func (s *Service) processImage(ctx context.Context, srcImg image.Image, processo defer f.Close() return imaging.Decode(f) - case "shadow": - shadow := makeBoxShadow(srcImg, color.Black, 4, 10, 0) - composit := imaging.OverlayCenter(shadow, srcImg, 1.0) - return composit, nil + //case "shadow": + // shadow := makeBoxShadow(srcImg, color.Black, 4, 10, 0) + // composit := imaging.OverlayCenter(shadow, srcImg, 1.0) + // return composit, nil } - return nil, fmt.Errorf("unknown processor type: %v", processor.Type) + + proc, ok := processors[processor.Type] + if !ok { + return nil, fmt.Errorf("unknown processor type: %v", processor.Type) + } + + paramType := proc.newParams() + if err := json.Unmarshal(processor.Props, paramType); err != nil { + return nil, err + } + return proc.processImage(ctx, srcImg, paramType) } type imageSource interface { diff --git a/services/imgedit/service.go b/services/imgedit/service.go index 97603a8..d9f3ba4 100644 --- a/services/imgedit/service.go +++ b/services/imgedit/service.go @@ -3,6 +3,7 @@ package imgedit import ( "context" "encoding/json" + "fmt" "io" "time" @@ -97,10 +98,21 @@ func (s *Service) AddProcessor(ctx context.Context, sessionID string, req AddPro return nil, err } - // TODO: verify processor, etc. + proc, ok := processors[req.Type] + if !ok { + return nil, fmt.Errorf("unknown processor type: %v", req.Type) + } + + paramType := proc.newParams() + paramBytes, err := json.Marshal(paramType) + if err != nil { + return nil, err + } + session.Processors = append(session.Processors, models.ImageEditProcessor{ - ID: models.NewNanoID(), - Type: req.Type, + ID: models.NewNanoID(), + Type: req.Type, + Props: paramBytes, }) session.RecalcVersionIDs() From f9a65c8ca9b2d4c8808c960868d23e9b871c00b1 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Fri, 27 Mar 2026 21:43:03 +1100 Subject: [PATCH 33/40] Have got adjusting processor arguments working --- assets/js/controllers/edit_upload.js | 44 ++++++++++++++++++++++++--- cmds/server.go | 1 + handlers/imageedit.go | 29 ++++++++++++++++++ services/imgedit/processing.go | 45 ++++++++++++++++++++++++++-- services/imgedit/service.go | 29 ++++++++++++++++++ views/uploads/edit.html | 17 ++++++----- 6 files changed, 151 insertions(+), 14 deletions(-) diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js index f1d472a..f575bea 100644 --- a/assets/js/controllers/edit_upload.js +++ b/assets/js/controllers/edit_upload.js @@ -24,9 +24,17 @@ const processorUIs = { "shadow": { label: "Shadow", template: Handlebars.compile(` -
    - - +
    + +
    + +
    +
    +
    + +
    + +
    `), }, @@ -67,10 +75,19 @@ export default class UploadEditController extends Controller { async removeProcessor(ev) { ev.preventDefault(); let id = ev.params.id; - console.log(ev.params); await this._removeProcessor(id); } + async updateProcessor(ev) { + ev.preventDefault(); + let id = ev.params.id; + + let paramParentEl = ev.target.closest('[data-role="processor-params"]'); + let params = Object.fromEntries(new FormData(paramParentEl).entries()); + + await this._updateProcessor(id, params); + } + _rebuildProcessList() { let el = this.processListTarget; @@ -135,6 +152,25 @@ export default class UploadEditController extends Controller { } } + async _updateProcessor(processorID, params) { + await this._doReturningState(async () => { + return (await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}`, { + method: 'PATCH', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + processor: { + id: processorID, + props: params, + } + }) + })).json(); + }) + } + + async _removeProcessor(processorID) { await this._doReturningState(async () => { return (await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/processors/${processorID}`, { diff --git a/cmds/server.go b/cmds/server.go index 515f7a5..7a1445a 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -153,6 +153,7 @@ Starting weiro without any arguments will start the server. siteGroup.Get("/uploads/:uploadID/edit", uh.Edit) siteGroup.Post("/imageedit", ieh.Create) + siteGroup.Patch("/imageedit/:sessionID", ieh.PatchSession) siteGroup.Post("/imageedit/:sessionID/processors", ieh.AddProcessor) siteGroup.Delete("/imageedit/:sessionID/processors/:processorID", ieh.DeleteProcessor) siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview) diff --git a/handlers/imageedit.go b/handlers/imageedit.go index 8026c53..ced7f75 100644 --- a/handlers/imageedit.go +++ b/handlers/imageedit.go @@ -113,3 +113,32 @@ func (ieh ImageEditHandlers) DeleteProcessor(c fiber.Ctx) error { PreviewURL: res.PreviewURL(), }) } + +func (ieh ImageEditHandlers) PatchSession(c fiber.Ctx) error { + var req struct { + UpdateProc *imgedit.UpdateProcessorReq `json:"processor"` + } + + sessionID := c.Params("sessionID") + if sessionID == "" { + return fiber.ErrBadRequest + } + + if err := c.Bind().Body(&req); err != nil { + return err + } + log.Printf("Got request: %v", *req.UpdateProc) + + if req.UpdateProc != nil { + res, err := ieh.ImageEditService.UpdateProcessor(c.Context(), sessionID, *req.UpdateProc) + if err != nil { + return err + } + return c.Status(http.StatusOK).JSON(sessionResponse{ + Session: res, + PreviewURL: res.PreviewURL(), + }) + } + + return fiber.ErrBadRequest +} diff --git a/services/imgedit/processing.go b/services/imgedit/processing.go index 378ead5..c1f99bf 100644 --- a/services/imgedit/processing.go +++ b/services/imgedit/processing.go @@ -21,7 +21,7 @@ type imageProcessor struct { type shadowProcessorArgs struct { Color string `json:"color"` - OffsetY int `json:"offset_y"` + OffsetY int `json:"offset_y,string"` } var processors = map[string]imageProcessor{ @@ -35,7 +35,12 @@ var processors = map[string]imageProcessor{ processImage: func(ctx context.Context, srcImg image.Image, params any) (image.Image, error) { p := params.(*shadowProcessorArgs) - shadow := makeBoxShadow(srcImg, color.Black, 4, 10, p.OffsetY) + shadowColor, err := parseHexColor(p.Color) + if err != nil { + return nil, fmt.Errorf("invalid shadow color: %w", err) + } + + shadow := makeBoxShadow(srcImg, shadowColor, 4, 10, p.OffsetY) composit := imaging.OverlayCenter(shadow, srcImg, 1.0) return composit, nil }, @@ -135,3 +140,39 @@ type imageImageSource struct { func (i imageImageSource) image() (image.Image, error) { return i.img, nil } + +func parseHexColor(s string) (color.Color, error) { + // Remove leading hash if present + if len(s) > 0 && s[0] == '#' { + s = s[1:] + } + + // Parse based on length + var r, g, b, a uint8 + switch len(s) { + case 6: + // RGB format + var rgb uint32 + if _, err := fmt.Sscanf(s, "%06x", &rgb); err != nil { + return nil, fmt.Errorf("invalid hex color format: %w", err) + } + r = uint8((rgb >> 16) & 0xFF) + g = uint8((rgb >> 8) & 0xFF) + b = uint8(rgb & 0xFF) + a = 0xFF + case 8: + // RGBA format + var rgba uint32 + if _, err := fmt.Sscanf(s, "%08x", &rgba); err != nil { + return nil, fmt.Errorf("invalid hex color format: %w", err) + } + r = uint8((rgba >> 24) & 0xFF) + g = uint8((rgba >> 16) & 0xFF) + b = uint8((rgba >> 8) & 0xFF) + a = uint8(rgba & 0xFF) + default: + return nil, fmt.Errorf("invalid hex color length: expected 6 or 8 characters, got %d", len(s)) + } + + return color.RGBA{R: r, G: g, B: b, A: a}, nil +} diff --git a/services/imgedit/service.go b/services/imgedit/service.go index d9f3ba4..c53a37e 100644 --- a/services/imgedit/service.go +++ b/services/imgedit/service.go @@ -146,6 +146,35 @@ func (s *Service) DeleteProcessor(ctx context.Context, sessionID, processorID st return session, nil } +type UpdateProcessorReq struct { + ID string `json:"id"` + Props json.RawMessage `json:"props"` +} + +func (s *Service) UpdateProcessor(ctx context.Context, sessionID string, req UpdateProcessorReq) (*models.ImageEditSession, error) { + session, err := s.loadAndVerifySession(ctx, sessionID) + if err != nil { + return nil, err + } + + for i, p := range session.Processors { + if p.ID == req.ID { + session.Processors[i].Props = req.Props + break + } + } + + session.RecalcVersionIDs() + if err := s.sessionStore.save(session); err != nil { + return nil, err + } + if _, err := s.reprocess(ctx, session); err != nil { + return nil, err + } + + return session, nil +} + func (s *Service) loadAndVerifySession(ctx context.Context, sessionID string) (*models.ImageEditSession, error) { site, user, err := s.fetchSiteAndUser(ctx) if err != nil { diff --git a/views/uploads/edit.html b/views/uploads/edit.html index 5c8cc2d..21b41bb 100644 --- a/views/uploads/edit.html +++ b/views/uploads/edit.html @@ -1,12 +1,12 @@ -
    +
    -
    +
    - {{ .upload.Upload.Alt }} + {{ .upload.Upload.Alt }}
    @@ -25,6 +25,7 @@
    - Actions go here + +
    \ No newline at end of file From c8a276b248902c41af64e254c04ef8ed8fc954ba Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sat, 28 Mar 2026 21:42:35 +1100 Subject: [PATCH 34/40] Have got saving working --- assets/js/controllers/edit_upload.js | 46 +++++++++++- cmds/server.go | 1 + handlers/imageedit.go | 21 ++++++ providers/db/gen/sqlgen/categories.sql.go | 2 +- providers/db/gen/sqlgen/db.go | 2 +- providers/db/gen/sqlgen/models.go | 2 +- providers/db/gen/sqlgen/pages.sql.go | 2 +- .../db/gen/sqlgen/pending_uploads.sql.go | 2 +- providers/db/gen/sqlgen/posts.sql.go | 2 +- providers/db/gen/sqlgen/pubtargets.sql.go | 2 +- providers/db/gen/sqlgen/sites.sql.go | 2 +- providers/db/gen/sqlgen/uploads.sql.go | 26 +++++-- providers/db/gen/sqlgen/users.sql.go | 2 +- providers/db/uploads.go | 13 +++- providers/uploadfiles/provider.go | 5 ++ services/imgedit/service.go | 52 ++++++++++++++ services/imgedit/store.go | 4 ++ services/uploads/manage.go | 72 +++++++++++++++++++ sql/queries/uploads.sql | 5 +- views/uploads/edit.html | 2 +- views/uploads/show.html | 5 +- 21 files changed, 248 insertions(+), 22 deletions(-) diff --git a/assets/js/controllers/edit_upload.js b/assets/js/controllers/edit_upload.js index f575bea..95cbb1e 100644 --- a/assets/js/controllers/edit_upload.js +++ b/assets/js/controllers/edit_upload.js @@ -1,3 +1,4 @@ +import feather from "feather-icons/dist/feather.js"; import Handlebars from "handlebars"; import {Controller} from "@hotwired/stimulus"; @@ -7,12 +8,12 @@ Handlebars.registerHelper("submit_on", function (id, event) { const processorFrame = Handlebars.compile(`
    -
    +
    {{name}} - X + >
    {{{props}}}
    @@ -78,6 +79,16 @@ export default class UploadEditController extends Controller { await this._removeProcessor(id); } + async saveUpload(ev) { + ev.preventDefault(); + await this._save("replace"); + } + + async saveNewUpload(ev) { + ev.preventDefault(); + await this._save("copy"); + } + async updateProcessor(ev) { ev.preventDefault(); let id = ev.params.id; @@ -108,6 +119,8 @@ export default class UploadEditController extends Controller { }); el.innerHTML += cardOuter; } + + feather.replace(); } async _createSession() { @@ -179,6 +192,33 @@ export default class UploadEditController extends Controller { }) } + async _save(mode) { + if (!this._state || !this._state.session) { + return; + } + + try { + let resp = await fetch(`/sites/${this.siteIdValue}/imageedit/${this._state.session.guid}/save`, { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ mode }) + }); + + if (!resp.ok) { + console.error("Save failed:", resp.statusText); + return; + } + + let result = await resp.json(); + window.location.href = `/sites/${this.siteIdValue}/uploads/${result.upload_id}`; + } catch (e) { + console.error(e); + } + } + async _doReturningState(fn) { try { this._state = await fn(); diff --git a/cmds/server.go b/cmds/server.go index 7a1445a..28e2ccc 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -156,6 +156,7 @@ Starting weiro without any arguments will start the server. siteGroup.Patch("/imageedit/:sessionID", ieh.PatchSession) siteGroup.Post("/imageedit/:sessionID/processors", ieh.AddProcessor) siteGroup.Delete("/imageedit/:sessionID/processors/:processorID", ieh.DeleteProcessor) + siteGroup.Post("/imageedit/:sessionID/save", ieh.Save) siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview) siteGroup.Get("/settings", ssh.General) diff --git a/handlers/imageedit.go b/handlers/imageedit.go index ced7f75..27a01b0 100644 --- a/handlers/imageedit.go +++ b/handlers/imageedit.go @@ -114,6 +114,27 @@ func (ieh ImageEditHandlers) DeleteProcessor(c fiber.Ctx) error { }) } +func (ieh ImageEditHandlers) Save(c fiber.Ctx) error { + sessionID := c.Params("sessionID") + if sessionID == "" { + return fiber.ErrBadRequest + } + + var req struct { + Mode string `json:"mode"` + } + if err := c.Bind().JSON(&req); err != nil { + return fiber.ErrBadRequest + } + + result, err := ieh.ImageEditService.Save(c.Context(), sessionID, req.Mode) + if err != nil { + return err + } + + return c.Status(http.StatusOK).JSON(result) +} + func (ieh ImageEditHandlers) PatchSession(c fiber.Ctx) error { var req struct { UpdateProc *imgedit.UpdateProcessorReq `json:"processor"` diff --git a/providers/db/gen/sqlgen/categories.sql.go b/providers/db/gen/sqlgen/categories.sql.go index d5bc40d..95a26e5 100644 --- a/providers/db/gen/sqlgen/categories.sql.go +++ b/providers/db/gen/sqlgen/categories.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: categories.sql package sqlgen diff --git a/providers/db/gen/sqlgen/db.go b/providers/db/gen/sqlgen/db.go index 8eab959..7d9d9e7 100644 --- a/providers/db/gen/sqlgen/db.go +++ b/providers/db/gen/sqlgen/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 package sqlgen diff --git a/providers/db/gen/sqlgen/models.go b/providers/db/gen/sqlgen/models.go index 3df1193..348c1ab 100644 --- a/providers/db/gen/sqlgen/models.go +++ b/providers/db/gen/sqlgen/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 package sqlgen diff --git a/providers/db/gen/sqlgen/pages.sql.go b/providers/db/gen/sqlgen/pages.sql.go index 1d53291..7dd5105 100644 --- a/providers/db/gen/sqlgen/pages.sql.go +++ b/providers/db/gen/sqlgen/pages.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: pages.sql package sqlgen diff --git a/providers/db/gen/sqlgen/pending_uploads.sql.go b/providers/db/gen/sqlgen/pending_uploads.sql.go index 63eeb60..a831bbe 100644 --- a/providers/db/gen/sqlgen/pending_uploads.sql.go +++ b/providers/db/gen/sqlgen/pending_uploads.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: pending_uploads.sql package sqlgen diff --git a/providers/db/gen/sqlgen/posts.sql.go b/providers/db/gen/sqlgen/posts.sql.go index ef3d170..129a49a 100644 --- a/providers/db/gen/sqlgen/posts.sql.go +++ b/providers/db/gen/sqlgen/posts.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: posts.sql package sqlgen diff --git a/providers/db/gen/sqlgen/pubtargets.sql.go b/providers/db/gen/sqlgen/pubtargets.sql.go index 69c09df..cd5cfa6 100644 --- a/providers/db/gen/sqlgen/pubtargets.sql.go +++ b/providers/db/gen/sqlgen/pubtargets.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: pubtargets.sql package sqlgen diff --git a/providers/db/gen/sqlgen/sites.sql.go b/providers/db/gen/sqlgen/sites.sql.go index 80ccbc0..797eaad 100644 --- a/providers/db/gen/sqlgen/sites.sql.go +++ b/providers/db/gen/sqlgen/sites.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: sites.sql package sqlgen diff --git a/providers/db/gen/sqlgen/uploads.sql.go b/providers/db/gen/sqlgen/uploads.sql.go index 189de2d..7ad3828 100644 --- a/providers/db/gen/sqlgen/uploads.sql.go +++ b/providers/db/gen/sqlgen/uploads.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: uploads.sql package sqlgen @@ -18,7 +18,7 @@ func (q *Queries) DeleteUpload(ctx context.Context, id int64) error { return err } -const insertUpload = `-- name: InsertUpload :exec +const insertUpload = `-- name: InsertUpload :one INSERT INTO uploads ( site_id, guid, @@ -43,8 +43,8 @@ type InsertUploadParams struct { CreatedAt int64 } -func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) error { - _, err := q.db.ExecContext(ctx, insertUpload, +func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) (int64, error) { + row := q.db.QueryRowContext(ctx, insertUpload, arg.SiteID, arg.Guid, arg.MimeType, @@ -54,7 +54,9 @@ func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) erro arg.Alt, arg.CreatedAt, ) - return err + var id int64 + err := row.Scan(&id) + return id, err } const selectUploadByID = `-- name: SelectUploadByID :one @@ -154,3 +156,17 @@ func (q *Queries) UpdateUpload(ctx context.Context, arg UpdateUploadParams) erro _, err := q.db.ExecContext(ctx, updateUpload, arg.Alt, arg.ID) return err } + +const updateUploadFileSize = `-- name: UpdateUploadFileSize :exec +UPDATE uploads SET file_size = ? WHERE id = ? +` + +type UpdateUploadFileSizeParams struct { + FileSize int64 + ID int64 +} + +func (q *Queries) UpdateUploadFileSize(ctx context.Context, arg UpdateUploadFileSizeParams) error { + _, err := q.db.ExecContext(ctx, updateUploadFileSize, arg.FileSize, arg.ID) + return err +} diff --git a/providers/db/gen/sqlgen/users.sql.go b/providers/db/gen/sqlgen/users.sql.go index 6007589..a70a3bf 100644 --- a/providers/db/gen/sqlgen/users.sql.go +++ b/providers/db/gen/sqlgen/users.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.28.0 +// sqlc v1.30.0 // source: users.sql package sqlgen diff --git a/providers/db/uploads.go b/providers/db/uploads.go index 006b7cc..b3033ab 100644 --- a/providers/db/uploads.go +++ b/providers/db/uploads.go @@ -44,7 +44,7 @@ func (db *Provider) SelectUploadBySiteIDAndSlug(ctx context.Context, siteID int6 func (db *Provider) SaveUpload(ctx context.Context, upload *models.Upload) error { if upload.ID == 0 { - if err := db.queries.InsertUpload(ctx, sqlgen.InsertUploadParams{ + newID, err := db.queries.InsertUpload(ctx, sqlgen.InsertUploadParams{ SiteID: upload.SiteID, Guid: upload.GUID, MimeType: upload.MIMEType, @@ -53,9 +53,11 @@ func (db *Provider) SaveUpload(ctx context.Context, upload *models.Upload) error Slug: upload.Slug, Alt: upload.Alt, CreatedAt: upload.CreatedAt.Unix(), - }); err != nil { + }) + if err != nil { return err } + upload.ID = newID return nil } @@ -65,6 +67,13 @@ func (db *Provider) SaveUpload(ctx context.Context, upload *models.Upload) error }) } +func (db *Provider) UpdateUploadFileSize(ctx context.Context, id int64, fileSize int64) error { + return db.queries.UpdateUploadFileSize(ctx, sqlgen.UpdateUploadFileSizeParams{ + FileSize: fileSize, + ID: id, + }) +} + func (db *Provider) DeleteUpload(ctx context.Context, id int64) error { return db.queries.DeleteUpload(ctx, id) } diff --git a/providers/uploadfiles/provider.go b/providers/uploadfiles/provider.go index 2eb84e4..610a6f9 100644 --- a/providers/uploadfiles/provider.go +++ b/providers/uploadfiles/provider.go @@ -66,6 +66,11 @@ func copyFile(src, dst string) error { return err } +func (p *Provider) ReplaceFile(site models.Site, up models.Upload, srcPath string) error { + fullPath := p.uploadFileName(site, up) + return copyFile(srcPath, fullPath) +} + func (p *Provider) OpenUpload(site models.Site, up models.Upload) (io.ReadCloser, error) { fullPath := p.uploadFileName(site, up) return os.Open(fullPath) diff --git a/services/imgedit/service.go b/services/imgedit/service.go index c53a37e..926633c 100644 --- a/services/imgedit/service.go +++ b/services/imgedit/service.go @@ -175,6 +175,58 @@ func (s *Service) UpdateProcessor(ctx context.Context, sessionID string, req Upd return session, nil } +type SaveResult struct { + UploadID int64 `json:"upload_id"` +} + +func (s *Service) Save(ctx context.Context, sessionID string, mode string) (*SaveResult, error) { + session, err := s.loadAndVerifySession(ctx, sessionID) + if err != nil { + return nil, err + } + + if len(session.Processors) == 0 { + return nil, fmt.Errorf("no processors in session") + } + + lastProc := session.Processors[len(session.Processors)-1] + finalImagePath := fmt.Sprintf("%v/%v/%v.%v", s.scratchDir, session.GUID, lastProc.VersionID, session.ImageExt) + + var mimeType string + switch session.ImageExt { + case "jpg", "jpeg": + mimeType = "image/jpeg" + case "png": + mimeType = "image/png" + } + + var uploadID int64 + switch mode { + case "replace": + upload, err := s.uploadService.ReplaceUploadFile(ctx, session.BaseUploadID, finalImagePath) + if err != nil { + return nil, err + } + uploadID = upload.ID + case "copy": + baseUpload, _, err := s.uploadService.OpenUpload(ctx, session.BaseUploadID) + if err != nil { + return nil, err + } + upload, err := s.uploadService.CreateUploadFromFile(ctx, finalImagePath, baseUpload.Filename, mimeType) + if err != nil { + return nil, err + } + uploadID = upload.ID + default: + return nil, fmt.Errorf("unknown save mode: %v", mode) + } + + s.sessionStore.delete(session.GUID) + + return &SaveResult{UploadID: uploadID}, nil +} + func (s *Service) loadAndVerifySession(ctx context.Context, sessionID string) (*models.ImageEditSession, error) { site, user, err := s.fetchSiteAndUser(ctx) if err != nil { diff --git a/services/imgedit/store.go b/services/imgedit/store.go index 7638dbe..df3403a 100644 --- a/services/imgedit/store.go +++ b/services/imgedit/store.go @@ -42,6 +42,10 @@ func (ss *sessionStore) get(guid string) (*models.ImageEditSession, error) { return &sessionData, nil } +func (ss *sessionStore) delete(guid string) { + os.RemoveAll(filepath.Join(ss.baseDir, guid)) +} + func (ss *sessionStore) getImage(session *models.ImageEditSession, imageFilename string) (string, func() (io.ReadCloser, error), error) { fullPath := filepath.Join(ss.baseDir, session.GUID, imageFilename) if s, err := os.Stat(fullPath); err != nil { diff --git a/services/uploads/manage.go b/services/uploads/manage.go index 32debac..9cb24ea 100644 --- a/services/uploads/manage.go +++ b/services/uploads/manage.go @@ -6,7 +6,10 @@ import ( "html/template" "io" "log" + "os" + "path/filepath" "strings" + "time" "lmika.dev/lmika/weiro/models" ) @@ -67,6 +70,75 @@ func (s *Service) renderCopyTemplate(upload models.Upload) string { return sb.String() } +func (s *Service) ReplaceUploadFile(ctx context.Context, uploadID int64, srcPath string) (models.Upload, error) { + site, _, err := s.fetchSiteAndUser(ctx) + if err != nil { + return models.Upload{}, err + } + + upload, err := s.db.SelectUploadByID(ctx, uploadID) + if err != nil { + return models.Upload{}, err + } else if upload.SiteID != site.ID { + return models.Upload{}, models.NotFoundError + } + + if err := s.up.ReplaceFile(site, upload, srcPath); err != nil { + return models.Upload{}, err + } + + stat, err := os.Stat(srcPath) + if err != nil { + return models.Upload{}, err + } + upload.FileSize = stat.Size() + + if err := s.db.UpdateUploadFileSize(ctx, upload.ID, upload.FileSize); err != nil { + return models.Upload{}, err + } + + return upload, nil +} + +func (s *Service) CreateUploadFromFile(ctx context.Context, srcPath string, filename string, mimeType string) (models.Upload, error) { + site, _, err := s.fetchSiteAndUser(ctx) + if err != nil { + return models.Upload{}, err + } + + stat, err := os.Stat(srcPath) + if err != nil { + return models.Upload{}, err + } + + newUploadGUID := models.NewNanoID() + newTime := time.Now().UTC() + newSlug := filepath.Join( + fmt.Sprintf("%04d", newTime.Year()), + fmt.Sprintf("%02d", newTime.Month()), + newUploadGUID+filepath.Ext(filename), + ) + + newUpload := models.Upload{ + SiteID: site.ID, + GUID: models.NewNanoID(), + FileSize: stat.Size(), + MIMEType: mimeType, + Filename: filename, + CreatedAt: newTime, + Slug: newSlug, + } + if err := s.db.SaveUpload(ctx, &newUpload); err != nil { + return models.Upload{}, err + } + + if err := s.up.AdoptFile(site, newUpload, srcPath); err != nil { + return models.Upload{}, err + } + + return newUpload, nil +} + func (s *Service) ListUploads(ctx context.Context) (res []UploadWithURL, _ error) { site, _, err := s.fetchSiteAndUser(ctx) if err != nil { diff --git a/sql/queries/uploads.sql b/sql/queries/uploads.sql index fc8b82d..f661591 100644 --- a/sql/queries/uploads.sql +++ b/sql/queries/uploads.sql @@ -7,7 +7,7 @@ SELECT * FROM uploads WHERE id = ? LIMIT 1; -- name: SelectUploadBySiteIDAndSlug :one SELECT * FROM uploads WHERE site_id = ? AND slug = ? LIMIT 1; --- name: InsertUpload :exec +-- name: InsertUpload :one INSERT INTO uploads ( site_id, guid, @@ -23,5 +23,8 @@ RETURNING id; -- name: UpdateUpload :exec UPDATE uploads SET alt = ? WHERE id = ?; +-- name: UpdateUploadFileSize :exec +UPDATE uploads SET file_size = ? WHERE id = ?; + -- name: DeleteUpload :exec DELETE FROM uploads WHERE id = ?; \ No newline at end of file diff --git a/views/uploads/edit.html b/views/uploads/edit.html index 21b41bb..a7b27ab 100644 --- a/views/uploads/edit.html +++ b/views/uploads/edit.html @@ -24,7 +24,7 @@
    -
    +
    diff --git a/views/uploads/show.html b/views/uploads/show.html index 087c10f..7b42a38 100644 --- a/views/uploads/show.html +++ b/views/uploads/show.html @@ -5,7 +5,10 @@ data-show-upload-site-id-value="{{ .upload.Upload.SiteID }}" data-show-upload-upload-id-value="{{ .upload.Upload.ID }}"> - + + Edit + +
    From 98828a48498259d48cbc1a6faff70ab8809cd73f Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sat, 28 Mar 2026 21:45:54 +1100 Subject: [PATCH 35/40] Removed some unused code --- services/imgedit/processing.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/imgedit/processing.go b/services/imgedit/processing.go index c1f99bf..ec84199 100644 --- a/services/imgedit/processing.go +++ b/services/imgedit/processing.go @@ -6,7 +6,6 @@ import ( "fmt" "image" "image/color" - "log" "os" "path/filepath" @@ -80,8 +79,6 @@ func (s *Service) reprocess(ctx context.Context, session *models.ImageEditSessio img = imageImageSource{resImg} } - log.Printf("result of processed image: %T", img) - return img, nil } @@ -105,10 +102,6 @@ func (s *Service) processImage(ctx context.Context, srcImg image.Image, processo defer f.Close() return imaging.Decode(f) - //case "shadow": - // shadow := makeBoxShadow(srcImg, color.Black, 4, 10, 0) - // composit := imaging.OverlayCenter(shadow, srcImg, 1.0) - // return composit, nil } proc, ok := processors[processor.Type] From 023574aac6a039e65329b52a283c002b426c2549 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 29 Mar 2026 09:33:24 +1100 Subject: [PATCH 36/40] Removed the login challenge --- handlers/login.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/handlers/login.go b/handlers/login.go index 30ed0b4..34c1e96 100644 --- a/handlers/login.go +++ b/handlers/login.go @@ -37,9 +37,8 @@ func (lh *LoginHandler) Logout(c fiber.Ctx) error { func (lh *LoginHandler) DoLogin(c fiber.Ctx) error { var req struct { - Username string `form:"username"` - Password string `form:"password"` - LoginChallenge string `form:"_login_challenge"` + Username string `form:"username"` + Password string `form:"password"` } if err := c.Bind().Body(&req); err != nil { return c.Status(fiber.StatusBadRequest).SendString("Failed to parse request body") @@ -51,11 +50,6 @@ func (lh *LoginHandler) DoLogin(c fiber.Ctx) error { sess := session.FromContext(c) - challenge, _ := sess.Get("_login_challenge").(string) - if challenge != req.LoginChallenge { - return c.Redirect().To("/login") - } - user, err := lh.AuthService.Login(c.Context(), req.Username, req.Password) if err != nil { return c.Status(fiber.StatusInternalServerError).SendString("Failed to login") From 9b20665d11b039d07f5142c393610e44cd25079b Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 29 Mar 2026 10:45:45 +1100 Subject: [PATCH 37/40] Added support for footnotes and fixed category AJAX post --- assets/js/controllers/postedit.js | 10 ++++++++++ providers/markdown/renderer.go | 4 ++-- providers/sitebuilder/builder.go | 1 + providers/sitebuilder/processors.go | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/assets/js/controllers/postedit.js b/assets/js/controllers/postedit.js index 71328e3..f800c44 100644 --- a/assets/js/controllers/postedit.js +++ b/assets/js/controllers/postedit.js @@ -60,6 +60,16 @@ export default class PosteditController extends Controller { try { const formData = new FormData(this.element); let data = Object.fromEntries(formData.entries()); + + // Special handling for categories + let categoryIDs = []; + for (let i of formData.entries()) { + if (i[0] === "category_ids") { + categoryIDs.push(parseInt(i[1])) + } + } + + data["category_ids"] = categoryIDs; data = {...data, action: action || 'save'}; const response = await fetch(this.element.getAttribute("action"), { diff --git a/providers/markdown/renderer.go b/providers/markdown/renderer.go index aedd184..828ba96 100644 --- a/providers/markdown/renderer.go +++ b/providers/markdown/renderer.go @@ -22,7 +22,7 @@ type Renderer struct { func NewRendererForUI() *Renderer { mdParser := goldmark.New( - goldmark.WithExtensions(extension.GFM), + goldmark.WithExtensions(extension.GFM, extension.Footnote), goldmark.WithRendererOptions( gm_html.WithUnsafe(), ), @@ -48,7 +48,7 @@ func NewRendererForUI() *Renderer { func NewRendererForSite() *Renderer { mdParser := goldmark.New( - goldmark.WithExtensions(extension.GFM), + goldmark.WithExtensions(extension.GFM, extension.Footnote), goldmark.WithParserOptions( parser.WithAutoHeadingID(), ), diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go index 71ce926..d0bf17b 100644 --- a/providers/sitebuilder/builder.go +++ b/providers/sitebuilder/builder.go @@ -49,6 +49,7 @@ func New(site pubmodel.Site, opts Options) (*Builder, error) { mdRenderer: markdown.NewRendererForSite(), postMDProcessors: []postMDProcessor{ uploadAbsoluteURL, + removeFootnoteHRs, }, }, nil } diff --git a/providers/sitebuilder/processors.go b/providers/sitebuilder/processors.go index c699160..605d077 100644 --- a/providers/sitebuilder/processors.go +++ b/providers/sitebuilder/processors.go @@ -35,3 +35,8 @@ func uploadAbsoluteURL(site pubmodel.Site, dom *goquery.Document) error { }) return nil } + +func removeFootnoteHRs(site pubmodel.Site, dom *goquery.Document) error { + dom.Find("div.footnotes > hr").Remove() + return nil +} From deca23b5995a3540b5d2bc489197641c2153c2b3 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 29 Mar 2026 12:26:05 +1100 Subject: [PATCH 38/40] Fixed ordering of published posts --- providers/db/categories.go | 2 +- providers/db/gen/sqlgen/categories.sql.go | 8 ++-- providers/db/gen/sqlgen/posts.sql.go | 48 +++++++++++++++++++++++ providers/db/posts.go | 17 ++++++++ services/publisher/iter.go | 6 +-- services/publisher/service.go | 2 +- sql/queries/categories.sql | 2 +- sql/queries/posts.sql | 6 +++ 8 files changed, 81 insertions(+), 10 deletions(-) diff --git a/providers/db/categories.go b/providers/db/categories.go index 72fac94..f8db6d3 100644 --- a/providers/db/categories.go +++ b/providers/db/categories.go @@ -82,7 +82,7 @@ func (db *Provider) SelectCategoriesOfPost(ctx context.Context, postID int64) ([ return cats, nil } -func (db *Provider) SelectPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) { +func (db *Provider) SelectPublishedPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) { rows, err := db.queries.SelectPostsOfCategory(ctx, sqlgen.SelectPostsOfCategoryParams{ CategoryID: categoryID, Limit: pp.Limit, diff --git a/providers/db/gen/sqlgen/categories.sql.go b/providers/db/gen/sqlgen/categories.sql.go index 95a26e5..f6a291f 100644 --- a/providers/db/gen/sqlgen/categories.sql.go +++ b/providers/db/gen/sqlgen/categories.sql.go @@ -227,7 +227,7 @@ func (q *Queries) SelectCategoryBySlugAndSite(ctx context.Context, arg SelectCat return i, err } -const selectPostsOfCategory = `-- name: SelectPostsOfCategory :many +const selectPublishedPostsOfCategory = `-- name: SelectPublishedPostsOfCategory :many SELECT p.id, p.site_id, p.state, p.guid, p.title, p.body, p.slug, p.created_at, p.updated_at, p.published_at, p.deleted_at FROM posts p INNER JOIN post_categories pc ON pc.post_id = p.id WHERE pc.category_id = ? AND p.state = 0 AND p.deleted_at = 0 @@ -235,14 +235,14 @@ ORDER BY p.published_at DESC LIMIT ? OFFSET ? ` -type SelectPostsOfCategoryParams struct { +type SelectPublishedPostsOfCategoryParams struct { CategoryID int64 Limit int64 Offset int64 } -func (q *Queries) SelectPostsOfCategory(ctx context.Context, arg SelectPostsOfCategoryParams) ([]Post, error) { - rows, err := q.db.QueryContext(ctx, selectPostsOfCategory, arg.CategoryID, arg.Limit, arg.Offset) +func (q *Queries) SelectPublishedPostsOfCategory(ctx context.Context, arg SelectPublishedPostsOfCategoryParams) ([]Post, error) { + rows, err := q.db.QueryContext(ctx, selectPublishedPostsOfCategory, arg.CategoryID, arg.Limit, arg.Offset) if err != nil { return nil, err } diff --git a/providers/db/gen/sqlgen/posts.sql.go b/providers/db/gen/sqlgen/posts.sql.go index 129a49a..b1d3afb 100644 --- a/providers/db/gen/sqlgen/posts.sql.go +++ b/providers/db/gen/sqlgen/posts.sql.go @@ -200,6 +200,54 @@ func (q *Queries) SelectPostsOfSite(ctx context.Context, arg SelectPostsOfSitePa return items, nil } +const selectPublishedPostsOfSite = `-- name: SelectPublishedPostsOfSite :many +SELECT id, site_id, state, guid, title, body, slug, created_at, updated_at, published_at, deleted_at +FROM posts +WHERE site_id = ?1 AND state = 0 AND deleted_at = 0 +ORDER BY published_at DESC LIMIT ?3 OFFSET ?2 +` + +type SelectPublishedPostsOfSiteParams struct { + SiteID int64 + Offset int64 + Limit int64 +} + +func (q *Queries) SelectPublishedPostsOfSite(ctx context.Context, arg SelectPublishedPostsOfSiteParams) ([]Post, error) { + rows, err := q.db.QueryContext(ctx, selectPublishedPostsOfSite, arg.SiteID, arg.Offset, arg.Limit) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Post + for rows.Next() { + var i Post + if err := rows.Scan( + &i.ID, + &i.SiteID, + &i.State, + &i.Guid, + &i.Title, + &i.Body, + &i.Slug, + &i.CreatedAt, + &i.UpdatedAt, + &i.PublishedAt, + &i.DeletedAt, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + const softDeletePost = `-- name: SoftDeletePost :exec UPDATE posts SET deleted_at = ? WHERE id = ? ` diff --git a/providers/db/posts.go b/providers/db/posts.go index 7f58d1a..3b86aaf 100644 --- a/providers/db/posts.go +++ b/providers/db/posts.go @@ -47,6 +47,23 @@ func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDel return posts, nil } +func (db *Provider) SelectPublishedPostsOfSite(ctx context.Context, siteID int64, pp PagingParams) ([]*models.Post, error) { + rows, err := db.queries.SelectPublishedPostsOfSite(ctx, sqlgen.SelectPublishedPostsOfSiteParams{ + SiteID: siteID, + Limit: pp.Limit, + Offset: pp.Offset, + }) + if err != nil { + return nil, err + } + + posts := make([]*models.Post, len(rows)) + for i, row := range rows { + posts[i] = dbPostToPost(row) + } + return posts, nil +} + func (db *Provider) SelectPost(ctx context.Context, postID int64) (*models.Post, error) { row, err := db.queries.SelectPost(ctx, postID) if err != nil { diff --git a/services/publisher/iter.go b/services/publisher/iter.go index ea70616..d07d4fe 100644 --- a/services/publisher/iter.go +++ b/services/publisher/iter.go @@ -9,10 +9,10 @@ import ( ) // postIter returns a post iterator which returns posts in reverse chronological order. -func (s *Publisher) postIter(ctx context.Context, site int64) iter.Seq[models.Maybe[*models.Post]] { +func (s *Publisher) publishedPostIter(ctx context.Context, site int64) iter.Seq[models.Maybe[*models.Post]] { return func(yield func(models.Maybe[*models.Post]) bool) { paging := db.PagingParams{Offset: 0, Limit: 50} - page, err := s.db.SelectPostsOfSite(ctx, site, false, paging) + page, err := s.db.SelectPublishedPostsOfSite(ctx, site, paging) if err != nil { yield(models.Maybe[*models.Post]{Err: err}) return @@ -45,7 +45,7 @@ func (s *Publisher) postIterByCategory(ctx context.Context, categoryID int64) it return func(yield func(models.Maybe[*models.Post]) bool) { paging := db.PagingParams{Offset: 0, Limit: 50} for { - page, err := s.db.SelectPostsOfCategory(ctx, categoryID, paging) + page, err := s.db.SelectPublishedPostsOfCategory(ctx, categoryID, paging) if err != nil { yield(models.Maybe[*models.Post]{Err: err}) return diff --git a/services/publisher/service.go b/services/publisher/service.go index adfcdd7..a5072a5 100644 --- a/services/publisher/service.go +++ b/services/publisher/service.go @@ -79,7 +79,7 @@ func (p *Publisher) Publish(ctx context.Context, site models.Site) error { pubSite := pubmodel.Site{ Site: site, PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] { - return p.postIter(ctx, site.ID) + return p.publishedPostIter(ctx, site.ID) }, BaseURL: target.BaseURL, Uploads: uploads, diff --git a/sql/queries/categories.sql b/sql/queries/categories.sql index 4b48506..b8e0e64 100644 --- a/sql/queries/categories.sql +++ b/sql/queries/categories.sql @@ -17,7 +17,7 @@ INNER JOIN post_categories pc ON pc.category_id = c.id WHERE pc.post_id = ? ORDER BY c.name ASC; --- name: SelectPostsOfCategory :many +-- name: SelectPublishedPostsOfCategory :many SELECT p.* FROM posts p INNER JOIN post_categories pc ON pc.post_id = p.id WHERE pc.category_id = ? AND p.state = 0 AND p.deleted_at = 0 diff --git a/sql/queries/posts.sql b/sql/queries/posts.sql index 5a4c18e..feaae7f 100644 --- a/sql/queries/posts.sql +++ b/sql/queries/posts.sql @@ -17,6 +17,12 @@ WHERE site_id = sqlc.arg(site_id) AND ( END ) ORDER BY created_at DESC LIMIT sqlc.arg(limit) OFFSET sqlc.arg(offset); +-- name: SelectPublishedPostsOfSite :many +SELECT * +FROM posts +WHERE site_id = sqlc.arg(site_id) AND state = 0 AND deleted_at = 0 +ORDER BY published_at DESC LIMIT sqlc.arg(limit) OFFSET sqlc.arg(offset); + -- name: SelectPost :one SELECT * FROM posts WHERE id = ? LIMIT 1; From d21aeadd5655adc431f5effa780e46909c28cd40 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 29 Mar 2026 20:29:42 +1100 Subject: [PATCH 39/40] Fixed build --- providers/db/categories.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/db/categories.go b/providers/db/categories.go index f8db6d3..23a9e67 100644 --- a/providers/db/categories.go +++ b/providers/db/categories.go @@ -83,7 +83,7 @@ func (db *Provider) SelectCategoriesOfPost(ctx context.Context, postID int64) ([ } func (db *Provider) SelectPublishedPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) { - rows, err := db.queries.SelectPostsOfCategory(ctx, sqlgen.SelectPostsOfCategoryParams{ + rows, err := db.queries.SelectPublishedPostsOfCategory(ctx, sqlgen.SelectPublishedPostsOfCategoryParams{ CategoryID: categoryID, Limit: pp.Limit, Offset: pp.Offset, From a3197f9b11f4802d7f6fc5e34223d4a0678cea3d Mon Sep 17 00:00:00 2001 From: lmika Date: Thu, 9 Apr 2026 11:40:52 +0000 Subject: [PATCH 40/40] Add Obsidian vault import feature (#8) - New 'Import Obsidian' action on site settings page - Upload a zip file of an Obsidian vault to import all notes as posts - Markdown notes imported with title from filename, published date from file timestamp, and body with front-matter stripped - Images and other attachments saved as Upload records - New obsimport service handles zip traversal and import logic - Unit tests for front-matter stripping Co-authored-by: Shelley Co-authored-by: exe.dev user Reviewed-on: https://lmika.dev/lmika/weiro/pulls/8 --- cmds/server.go | 4 + handlers/obsimport.go | 50 +++++++ services/obsimport/service.go | 229 +++++++++++++++++++++++++++++ services/obsimport/service_test.go | 51 +++++++ services/services.go | 4 + views/obsimport/form.html | 21 +++ views/obsimport/result.html | 10 ++ views/sitesettings/general.html | 7 + 8 files changed, 376 insertions(+) create mode 100644 handlers/obsimport.go create mode 100644 services/obsimport/service.go create mode 100644 services/obsimport/service_test.go create mode 100644 views/obsimport/form.html create mode 100644 views/obsimport/result.html diff --git a/cmds/server.go b/cmds/server.go index 28e2ccc..29a8c2a 100644 --- a/cmds/server.go +++ b/cmds/server.go @@ -115,6 +115,7 @@ Starting weiro without any arguments will start the server. ssh := handlers.SiteSettingsHandler{SiteService: svcs.Sites} ch := handlers.CategoriesHandler{CategoryService: svcs.Categories} pgh := handlers.PagesHandler{PageService: svcs.Pages} + oih := handlers.ObsImportHandler{ObsImportService: svcs.ObsImport, ScratchDir: cfg.ScratchDir} app.Get("/login", lh.Login) app.Post("/login", lh.DoLogin) @@ -162,6 +163,9 @@ Starting weiro without any arguments will start the server. siteGroup.Get("/settings", ssh.General) siteGroup.Post("/settings", ssh.UpdateGeneral) + siteGroup.Get("/import/obsidian", oih.Form) + siteGroup.Post("/import/obsidian", oih.Upload) + siteGroup.Get("/categories", ch.Index) siteGroup.Get("/categories/new", ch.New) siteGroup.Get("/categories/:categoryID", ch.Edit) diff --git a/handlers/obsimport.go b/handlers/obsimport.go new file mode 100644 index 0000000..e20be77 --- /dev/null +++ b/handlers/obsimport.go @@ -0,0 +1,50 @@ +package handlers + +import ( + "fmt" + "os" + "path/filepath" + + "github.com/gofiber/fiber/v3" + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/services/obsimport" +) + +type ObsImportHandler struct { + ObsImportService *obsimport.Service + ScratchDir string +} + +func (h ObsImportHandler) Form(c fiber.Ctx) error { + return c.Render("obsimport/form", fiber.Map{}) +} + +func (h ObsImportHandler) Upload(c fiber.Ctx) error { + site := c.Locals("site").(models.Site) + + fileHeader, err := c.FormFile("zipfile") + if err != nil { + return fiber.NewError(fiber.StatusBadRequest, "no file provided") + } + + // Save uploaded file to scratch dir + if err := os.MkdirAll(h.ScratchDir, 0755); err != nil { + return err + } + + dstPath := filepath.Join(h.ScratchDir, models.NewNanoID()+".zip") + if err := c.SaveFile(fileHeader, dstPath); err != nil { + return err + } + defer os.Remove(dstPath) + + result, err := h.ObsImportService.ImportZip(c.Context(), dstPath) + if err != nil { + return err + } + + return c.Render("obsimport/result", fiber.Map{ + "result": result, + "siteURL": fmt.Sprintf("/sites/%v/posts", site.ID), + }) +} diff --git a/services/obsimport/service.go b/services/obsimport/service.go new file mode 100644 index 0000000..0852031 --- /dev/null +++ b/services/obsimport/service.go @@ -0,0 +1,229 @@ +package obsimport + +import ( + "archive/zip" + "bufio" + "context" + "fmt" + "io" + "log" + "mime" + "os" + "path/filepath" + "strings" + "time" + + "lmika.dev/lmika/weiro/models" + "lmika.dev/lmika/weiro/providers/db" + "lmika.dev/lmika/weiro/providers/uploadfiles" + "lmika.dev/lmika/weiro/services/publisher" +) + +type Service struct { + db *db.Provider + up *uploadfiles.Provider + publisher *publisher.Queue + scratchDir string +} + +func New(db *db.Provider, up *uploadfiles.Provider, publisher *publisher.Queue, scratchDir string) *Service { + return &Service{ + db: db, + up: up, + publisher: publisher, + scratchDir: scratchDir, + } +} + +type ImportResult struct { + PostsImported int + UploadsImported int +} + +func (s *Service) ImportZip(ctx context.Context, zipPath string) (ImportResult, error) { + site, ok := models.GetSite(ctx) + if !ok { + return ImportResult{}, models.SiteRequiredError + } + + zr, err := zip.OpenReader(zipPath) + if err != nil { + return ImportResult{}, fmt.Errorf("open zip: %w", err) + } + defer zr.Close() + + var result ImportResult + + for _, f := range zr.File { + if f.FileInfo().IsDir() { + continue + } + + ext := strings.ToLower(filepath.Ext(f.Name)) + if ext == ".md" || ext == ".markdown" { + if err := s.importNote(ctx, site, f); err != nil { + log.Printf("warn: skipping note %s: %v", f.Name, err) + continue + } + result.PostsImported++ + } else if isAttachment(ext) { + if err := s.importAttachment(ctx, site, f); err != nil { + log.Printf("warn: skipping attachment %s: %v", f.Name, err) + continue + } + result.UploadsImported++ + } + } + + s.publisher.Queue(site) + + return result, nil +} + +func (s *Service) importNote(ctx context.Context, site models.Site, f *zip.File) error { + rc, err := f.Open() + if err != nil { + return err + } + defer rc.Close() + + data, err := io.ReadAll(rc) + if err != nil { + return err + } + + body := stripFrontMatter(string(data)) + title := strings.TrimSuffix(filepath.Base(f.Name), filepath.Ext(f.Name)) + publishedAt := f.Modified + if publishedAt.IsZero() { + publishedAt = time.Now() + } + + renderTZ, err := time.LoadLocation(site.Timezone) + if err != nil { + renderTZ = time.UTC + } + publishedAt = publishedAt.In(renderTZ) + + post := &models.Post{ + SiteID: site.ID, + GUID: models.NewNanoID(), + State: models.StatePublished, + Title: title, + Body: body, + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + PublishedAt: publishedAt, + } + post.Slug = post.BestSlug() + + return s.db.SavePost(ctx, post) +} + +func (s *Service) importAttachment(ctx context.Context, site models.Site, f *zip.File) error { + rc, err := f.Open() + if err != nil { + return err + } + defer rc.Close() + + // Write to a temp file in scratch dir + if err := os.MkdirAll(s.scratchDir, 0755); err != nil { + return err + } + + tmpFile, err := os.CreateTemp(s.scratchDir, "obsimport-*"+filepath.Ext(f.Name)) + if err != nil { + return err + } + tmpPath := tmpFile.Name() + + if _, err := io.Copy(tmpFile, rc); err != nil { + tmpFile.Close() + os.Remove(tmpPath) + return err + } + tmpFile.Close() + + filename := filepath.Base(f.Name) + mimeType := mime.TypeByExtension(filepath.Ext(filename)) + if mimeType == "" { + mimeType = "application/octet-stream" + } + + stat, err := os.Stat(tmpPath) + if err != nil { + os.Remove(tmpPath) + return err + } + + newUploadGUID := models.NewNanoID() + newTime := time.Now().UTC() + newSlug := filepath.Join( + fmt.Sprintf("%04d", newTime.Year()), + fmt.Sprintf("%02d", newTime.Month()), + newUploadGUID+filepath.Ext(filename), + ) + + newUpload := models.Upload{ + SiteID: site.ID, + GUID: models.NewNanoID(), + FileSize: stat.Size(), + MIMEType: mimeType, + Filename: filename, + CreatedAt: newTime, + Slug: newSlug, + } + if err := s.db.SaveUpload(ctx, &newUpload); err != nil { + os.Remove(tmpPath) + return err + } + + if err := s.up.AdoptFile(site, newUpload, tmpPath); err != nil { + os.Remove(tmpPath) + return err + } + + return nil +} + +// stripFrontMatter removes YAML front matter (delimited by ---) from markdown content. +func stripFrontMatter(content string) string { + scanner := bufio.NewScanner(strings.NewReader(content)) + + // Check if the first line is a front matter delimiter + if !scanner.Scan() { + return content + } + firstLine := strings.TrimSpace(scanner.Text()) + if firstLine != "---" { + return content + } + + // Skip until the closing --- + for scanner.Scan() { + if strings.TrimSpace(scanner.Text()) == "---" { + // Return everything after the closing delimiter + var rest strings.Builder + for scanner.Scan() { + rest.WriteString(scanner.Text()) + rest.WriteString("\n") + } + return strings.TrimLeft(rest.String(), "\n") + } + } + + // No closing delimiter found, return original content + return content +} + +var attachmentExts = map[string]bool{ + ".png": true, ".jpg": true, ".jpeg": true, ".gif": true, ".svg": true, ".webp": true, + ".bmp": true, ".ico": true, ".tiff": true, ".tif": true, + ".mp3": true, ".mp4": true, ".wav": true, ".ogg": true, ".webm": true, + ".pdf": true, ".doc": true, ".docx": true, ".xls": true, ".xlsx": true, +} + +func isAttachment(ext string) bool { + return attachmentExts[ext] +} diff --git a/services/obsimport/service_test.go b/services/obsimport/service_test.go new file mode 100644 index 0000000..51123de --- /dev/null +++ b/services/obsimport/service_test.go @@ -0,0 +1,51 @@ +package obsimport + +import "testing" + +func TestStripFrontMatter(t *testing.T) { + tests := []struct { + name string + input string + want string + }{ + { + name: "no front matter", + input: "Hello world\nThis is a note", + want: "Hello world\nThis is a note", + }, + { + name: "with front matter", + input: "---\ntitle: Test\ntags: [a, b]\n---\nHello world\nThis is a note\n", + want: "Hello world\nThis is a note\n", + }, + { + name: "only front matter", + input: "---\ntitle: Test\n---\n", + want: "", + }, + { + name: "unclosed front matter", + input: "---\ntitle: Test\nno closing delimiter", + want: "---\ntitle: Test\nno closing delimiter", + }, + { + name: "empty string", + input: "", + want: "", + }, + { + name: "front matter with leading newlines stripped", + input: "---\nkey: val\n---\n\n\nBody here\n", + want: "Body here\n", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := stripFrontMatter(tt.input) + if got != tt.want { + t.Errorf("stripFrontMatter() = %q, want %q", got, tt.want) + } + }) + } +} diff --git a/services/services.go b/services/services.go index ab1a4ca..a79e903 100644 --- a/services/services.go +++ b/services/services.go @@ -9,6 +9,7 @@ import ( "lmika.dev/lmika/weiro/services/auth" "lmika.dev/lmika/weiro/services/categories" "lmika.dev/lmika/weiro/services/imgedit" + "lmika.dev/lmika/weiro/services/obsimport" "lmika.dev/lmika/weiro/services/pages" "lmika.dev/lmika/weiro/services/posts" "lmika.dev/lmika/weiro/services/publisher" @@ -27,6 +28,7 @@ type Services struct { ImageEdit *imgedit.Service Categories *categories.Service Pages *pages.Service + ObsImport *obsimport.Service } func New(cfg config.Config) (*Services, error) { @@ -46,6 +48,7 @@ func New(cfg config.Config) (*Services, error) { imageEditService := imgedit.New(uploadService, filepath.Join(cfg.ScratchDir, "imageedit")) categoriesService := categories.New(dbp, publisherQueue) pagesService := pages.New(dbp, publisherQueue) + obsImportService := obsimport.New(dbp, ufp, publisherQueue, filepath.Join(cfg.ScratchDir, "obsimport")) return &Services{ DB: dbp, @@ -58,6 +61,7 @@ func New(cfg config.Config) (*Services, error) { ImageEdit: imageEditService, Categories: categoriesService, Pages: pagesService, + ObsImport: obsImportService, }, nil } diff --git a/views/obsimport/form.html b/views/obsimport/form.html new file mode 100644 index 0000000..ccb27a5 --- /dev/null +++ b/views/obsimport/form.html @@ -0,0 +1,21 @@ +
    +
    +
    Import from Obsidian
    +

    Select an Obsidian vault exported as a Zip file. All Markdown notes will be imported as posts, and any images or attachments will be imported as uploads.

    +
    +
    + +
    + +
    +
    +
    +
    +
    + + Cancel +
    +
    +
    +
    +
    diff --git a/views/obsimport/result.html b/views/obsimport/result.html new file mode 100644 index 0000000..15ebe31 --- /dev/null +++ b/views/obsimport/result.html @@ -0,0 +1,10 @@ +
    +
    +
    Import Complete
    +
    +

    Successfully imported {{ .result.PostsImported }} post(s) and {{ .result.UploadsImported }} upload(s).

    +
    + Go to Posts + Back to Settings +
    +
    diff --git a/views/sitesettings/general.html b/views/sitesettings/general.html index 6f1833b..c0989c5 100644 --- a/views/sitesettings/general.html +++ b/views/sitesettings/general.html @@ -66,5 +66,12 @@
    +
    +
    +
    + Import Obsidian + Import posts and attachments from an Obsidian vault zip file. +
    +
    \ No newline at end of file