-{{ 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.
diff --git a/docs/superpowers/specs/2026-03-22-pages-design.md b/docs/superpowers/specs/2026-03-22-pages-design.md
deleted file mode 100644
index cc17417..0000000
--- a/docs/superpowers/specs/2026-03-22-pages-design.md
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.
diff --git a/docs/superpowers/specs/2026-03-22-paging-design.md b/docs/superpowers/specs/2026-03-22-paging-design.md
deleted file mode 100644
index 80e3ee6..0000000
--- a/docs/superpowers/specs/2026-03-22-paging-design.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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`.
diff --git a/handlers/imageedit.go b/handlers/imageedit.go
deleted file mode 100644
index 27a01b0..0000000
--- a/handlers/imageedit.go
+++ /dev/null
@@ -1,165 +0,0 @@
-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
-}
-
-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"`
- }
-
- 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 = sessionResponse{
- 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
- }
- })
-}
-
-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(),
- })
-}
-
-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(),
- })
-}
-
-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"`
- }
-
- 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/handlers/index.go b/handlers/index.go
index 410c347..6062237 100644
--- a/handlers/index.go
+++ b/handlers/index.go
@@ -2,7 +2,6 @@ package handlers
import (
"fmt"
- "log"
"net/url"
"regexp"
@@ -38,13 +37,6 @@ 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/login.go b/handlers/login.go
index 34c1e96..30ed0b4 100644
--- a/handlers/login.go
+++ b/handlers/login.go
@@ -37,8 +37,9 @@ 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"`
+ Username string `form:"username"`
+ Password string `form:"password"`
+ LoginChallenge string `form:"_login_challenge"`
}
if err := c.Bind().Body(&req); err != nil {
return c.Status(fiber.StatusBadRequest).SendString("Failed to parse request body")
@@ -50,6 +51,11 @@ 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")
diff --git a/handlers/middleware/errlog.go b/handlers/middleware/errlog.go
index 2acac04..5b6dfa6 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("%v: error: %v\n", c.Path(), err)
+ log.Printf("error: %v\n", err)
return err
}
return nil
diff --git a/handlers/middleware/site.go b/handlers/middleware/site.go
index 1d3ddf2..54211bc 100644
--- a/handlers/middleware/site.go
+++ b/handlers/middleware/site.go
@@ -5,7 +5,6 @@ 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"
@@ -33,22 +32,9 @@ 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)
-
- sess := session.FromContext(c)
- sess.Set("last_site_id", siteID)
-
- if pubTargets, err := sites.BestPubTarget(c.Context(), site); err == nil {
- c.Locals("pubTarget", pubTargets)
- }
-
return c.Next()
}
}
diff --git a/handlers/obsimport.go b/handlers/obsimport.go
deleted file mode 100644
index e20be77..0000000
--- a/handlers/obsimport.go
+++ /dev/null
@@ -1,50 +0,0 @@
-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/handlers/pages.go b/handlers/pages.go
deleted file mode 100644
index abefb41..0000000
--- a/handlers/pages.go
+++ /dev/null
@@ -1,118 +0,0 @@
-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": "post-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": "post-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})
-}
diff --git a/handlers/posts.go b/handlers/posts.go
index 0e491aa..a133758 100644
--- a/handlers/posts.go
+++ b/handlers/posts.go
@@ -6,7 +6,6 @@ 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"
)
@@ -19,43 +18,22 @@ 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
}
- 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,
- })
+ posts, err := ph.PostService.ListPosts(c.Context(), req.Filter == "deleted")
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
+ return posts
}), html(func(c fiber.Ctx) error {
return c.Render("posts/index", fiber.Map{
- "req": req,
- "posts": result.Posts,
- "pageInfo": pageInfo,
+ "req": req,
+ "posts": posts,
})
}))
}
@@ -75,7 +53,7 @@ func (ph PostsHandler) New(c fiber.Ctx) error {
"post": p,
"categories": cats,
"selectedCategories": map[int64]bool{},
- "bodyClass": "large-editor",
+ "bodyClass": "post-edit-page",
})
}
@@ -116,7 +94,7 @@ func (ph PostsHandler) Edit(c fiber.Ctx) error {
"post": post,
"categories": cats,
"selectedCategories": selectedCategories,
- "bodyClass": "large-editor",
+ "bodyClass": "post-edit-page",
})
}))
}
diff --git a/handlers/sitesettings.go b/handlers/sitesettings.go
index e61ced4..0fe2100 100644
--- a/handlers/sitesettings.go
+++ b/handlers/sitesettings.go
@@ -12,28 +12,10 @@ type SiteSettingsHandler struct {
SiteService *sites.Service
}
-func (s *SiteSettingsHandler) New(c fiber.Ctx) error {
- return c.Render("sitesettings/new", fiber.Map{}, "layouts/bare_with_scripts")
-}
+func (s *SiteSettingsHandler) General(ctx fiber.Ctx) error {
+ site := ctx.Locals("site").(models.Site)
-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{
+ return ctx.Render("sitesettings/general", fiber.Map{
"site": site,
"tzones": sites.ListZones(),
})
diff --git a/handlers/uploads.go b/handlers/uploads.go
index 3553b09..fa2cb98 100644
--- a/handlers/uploads.go
+++ b/handlers/uploads.go
@@ -162,24 +162,3 @@ 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/layouts/simplecss/templates/categories_single.html b/layouts/simplecss/templates/categories_single.html
index 133ad8d..deaeb02 100644
--- a/layouts/simplecss/templates/categories_single.html
+++ b/layouts/simplecss/templates/categories_single.html
@@ -8,10 +8,4 @@
{{ .HTML }}
{{ template "_post_meta.html" . }}
-{{ end }}
-{{ if or .PrevURL .NextURL }}
-
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/simplecss/templates/layout_main.html b/layouts/simplecss/templates/layout_main.html
index d3d27bd..4aa5199 100644
--- a/layouts/simplecss/templates/layout_main.html
+++ b/layouts/simplecss/templates/layout_main.html
@@ -13,13 +13,6 @@
{{ .Site.Title }}
{{ .Site.Tagline }}
- {{ if .Site.NavItems }}
-
- {{ end }}
diff --git a/layouts/simplecss/templates/pages_single.html b/layouts/simplecss/templates/pages_single.html
deleted file mode 100644
index 6883c3e..0000000
--- a/layouts/simplecss/templates/pages_single.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ if .Page.Title }}
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.
- {{ end }}
-
diff --git a/views/posts/edit.html b/views/posts/edit.html
index fbb94fa..d162788 100644
--- a/views/posts/edit.html
+++ b/views/posts/edit.html
@@ -1,5 +1,5 @@
{{ $isPublished := ne .post.State 1 }}
-
+
-
+
{{ if $isPublished }}
-
+
{{ else }}
-
-
+
+
{{ end }}
diff --git a/views/posts/index.html b/views/posts/index.html
index 7786539..bbf445d 100644
--- a/views/posts/index.html
+++ b/views/posts/index.html
@@ -62,22 +62,4 @@
{{ end }}
{{ end }}
-
- {{ if gt .pageInfo.TotalPages 1 }}
-
- {{ end }}
\ No newline at end of file
diff --git a/views/sitesettings/general.html b/views/sitesettings/general.html
index c0989c5..ca3e7a9 100644
--- a/views/sitesettings/general.html
+++ b/views/sitesettings/general.html
@@ -41,13 +41,6 @@
-
-
-
-
-
Number of posts per page on the generated site.
-
-
@@ -66,12 +59,5 @@
-
-
-
- Import Obsidian
- Import posts and attachments from an Obsidian vault zip file.
-
-
\ No newline at end of file
diff --git a/views/sitesettings/new.html b/views/sitesettings/new.html
deleted file mode 100644
index b057c72..0000000
--- a/views/sitesettings/new.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
New Site
-
-
-
\ No newline at end of file
diff --git a/views/uploads/edit.html b/views/uploads/edit.html
deleted file mode 100644
index a7b27ab..0000000
--- a/views/uploads/edit.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-