assets/css/main.scss

@@ -10,15 +10,6 @@ $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 {
@@ -31,24 +22,19 @@ $container-max-widths: (
     font-size: 0.9rem;
 }
 
-// Large editor
+// Post form
-//
-// Used for edit canvases which take up the entire window
 
-.large-editor {
+// Post edit page styling
+.post-edit-page {
     height: 100vh;
 }
 
-.large-editor main {
+.post-edit-page main {
     display: flex;
     flex-direction: column;
     overflow: hidden;
 }
 
-// Post form
-
-// Post edit page styling
-
 .post-edit-page .post-form {
     flex: 1;
     display: flex;

assets/js/controllers/edit_upload.js

@@ -1,233 +0,0 @@
-import feather from "feather-icons/dist/feather.js";
-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(`
-    <div class="card mb-3">
-      <div class="card-header d-flex justify-content-between align-items-center">
-        <span>{{name}}</span>
-        <a href="#" class="float-end"
-          data-action="edit-upload#removeProcessor"
-          data-edit-upload-id-param="{{id}}"
-        ><i data-feather="x" width="18" height="18"></i></a>
-      </div>
-      <div class="card-body">
-        <form data-role="processor-params" data-params-id="{{id}}">{{{props}}}</form>
-      </div>
-    </div>
-`);
-
-const processorUIs = {
-    "shadow": {
-        label: "Shadow",
-        template: Handlebars.compile(`
-            <div class="row mb-3 align-items-center">
-              <label for="{{id}}_color" class="col-sm col-form-label">Colour</label>
-              <div class="col-sm">
-                <input name="color" class="form-control" id="{{id}}_color" type="color" value="{{props.color}}" {{{submit_on id 'change'}}}>
-              </div>
-            </div>
-            <div class="row mb-3">
-              <label for="{{id}}_offset_y" class="col-sm col-form-label">Offset Y</label>
-              <div class="col-sm">
-                <input name="offset_y" class="form-control" id="{{id}}_{{props.color}}" type="number" value="{{props.offset_y}}" {{{submit_on id 'blur'}}}>
-              </div>
-            </div>
-        `),
-    },
-    "resize": {
-        label: "Resize",
-        template: Handlebars.compile(`
-            <div class="mb-3">
-              <label for="{{id}}_width" class="form-label">Width</label>
-              <input name="width" class="form-control" id="{{id}}_width">
-            </div>
-            <div class="mb-3">
-              <label for="{{id}}_height" class="form-label">Height</label>
-              <input name="width" class="form-control" id="{{id}}_width">
-            </div>
-        `),
-    },
-};
-
-export default class UploadEditController extends Controller {
-    static targets = ['processList', 'preview'];
-    static values = {
-        uploadId: Number,
-        siteId: Number,
-    };
-
-    connect() {
-        this._rebuildProcessList();
-        this._createSession();
-    }
-
-    async addProcessor(ev) {
-        ev.preventDefault();
-        await this._addProcessor({
-            type: "shadow"
-        });
-    }
-
-    async removeProcessor(ev) {
-        ev.preventDefault();
-        let id = ev.params.id;
-        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;
-
-        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;
-
-        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;
-        }
-
-        feather.replace();
-    }
-
-    async _createSession() {
-        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,
-                })
-            });
-
-            this._state = await resp.json();
-
-            this._rebuildProcessList();
-            this.previewTarget.src = this._state.preview_url;
-        } catch (e) {
-            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._rebuildProcessList();
-            this.previewTarget.src = this._state.preview_url;
-        } catch (e) {
-            console.error(e);
-        }
-    }
-
-    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}`, {
-                method: 'DELETE',
-            })).json();
-        })
-    }
-
-    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();
-
-            this._rebuildProcessList();
-            this.previewTarget.src = this._state.preview_url;
-        } catch (e) {
-            console.error(e);
-        }
-
-    }
-}

assets/js/controllers/pagelist.js

@@ -1,63 +0,0 @@
-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.",
-            });
-        }
-    }
-}

assets/js/controllers/postedit.js

@@ -60,16 +60,6 @@ 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"), {

assets/js/main.js

@@ -1,4 +1,3 @@
-import feather from "feather-icons/dist/feather.js";
 import { Application } from "@hotwired/stimulus";
 
 import ToastController from "./controllers/toast";
@@ -8,8 +7,6 @@ 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()
 Stimulus.register("toast", ToastController);
@@ -19,7 +16,3 @@ 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();

cmds/server.go

@@ -111,26 +111,14 @@ 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}
 
 			app.Get("/login", lh.Login)
 			app.Post("/login", lh.DoLogin)
 			app.Post("/logout", lh.Logout)
 
-			app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index)
+			siteGroup := app.Group("/sites/:siteID", middleware.LogErrors(), middleware.RequireUser(svcs.Auth), middleware.RequiresSite(svcs.Sites))
-			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)
@@ -150,14 +138,6 @@ 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.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.Post("/imageedit/:sessionID/save", ieh.Save)
-			siteGroup.Get("/imageedit/:sessionID/preview/:versionID", ieh.Preview)
 
 			siteGroup.Get("/settings", ssh.General)
 			siteGroup.Post("/settings", ssh.UpdateGeneral)
@@ -169,13 +149,11 @@ 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)
+			app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index)
-			siteGroup.Get("/pages/new", pgh.New)
+			app.Get("/first-run", ih.FirstRun)
-			siteGroup.Get("/pages/:pageID", pgh.Edit)
+			app.Post("/first-run", ih.FirstRunSubmit)
-			siteGroup.Post("/pages", pgh.Create)
+
-			siteGroup.Post("/pages/reorder", pgh.Reorder)
+			app.Get("/static/*", static.New("./static"))
-			siteGroup.Post("/pages/:pageID", pgh.Update)
-			siteGroup.Post("/pages/:pageID/delete", pgh.Delete)
 
 			if err := app.Listen(":3000"); err != nil {
 				log.Println(err)

docs/superpowers/specs/2026-03-22-pages-design.md

@@ -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.

handlers/imageedit.go

@@ -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
-}

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

handlers/login.go

@@ -39,6 +39,7 @@ func (lh *LoginHandler) DoLogin(c fiber.Ctx) error {
 	var req struct {
 		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")

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

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()
 	}
 }

handlers/pages.go

@@ -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})
-}

handlers/posts.go

@@ -75,7 +75,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 +116,7 @@ func (ph PostsHandler) Edit(c fiber.Ctx) error {
 			"post":               post,
 			"categories":         cats,
 			"selectedCategories": selectedCategories,
-			"bodyClass":          "large-editor",
+			"bodyClass":          "post-edit-page",
 		})
 	}))
 }

handlers/sitesettings.go

@@ -12,28 +12,10 @@ type SiteSettingsHandler struct {
 	SiteService *sites.Service
 }
 
-func (s *SiteSettingsHandler) New(c fiber.Ctx) error {
+func (s *SiteSettingsHandler) General(ctx fiber.Ctx) error {
-	return c.Render("sitesettings/new", fiber.Map{}, "layouts/bare_with_scripts")
+	site := ctx.Locals("site").(models.Site)
-}
 
-func (s *SiteSettingsHandler) Create(c fiber.Ctx) error {
+	return ctx.Render("sitesettings/general", fiber.Map{
-	var params sites.CreateSiteParams
-	if err := c.Bind().Body(&params); 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(),
 	})

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",
-	})
-}

layouts/simplecss/templates/categories_single.html

@@ -11,7 +11,7 @@
 {{ end }}
 {{ if or .PrevURL .NextURL }}
 <nav class="pagination">
-  {{ if .PrevURL }}<a href="{{ url_abs .PrevURL }}">← Newer posts</a>{{ end }}
+  {{ if .PrevURL }}<a href="{{ .PrevURL }}">← Newer posts</a>{{ end }}
-  {{ if .NextURL }}<a href="{{ url_abs .NextURL }}">Older posts →</a>{{ end }}
+  {{ if .NextURL }}<a href="{{ .NextURL }}">Older posts →</a>{{ end }}
 </nav>
 {{ end }}

layouts/simplecss/templates/layout_main.html

@@ -13,13 +13,6 @@
 <header>
   <h1>{{ .Site.Title }}</h1>
   <p>{{ .Site.Tagline }}</p>
-  {{ if .Site.NavItems }}
-    <nav>
-    {{ range .Site.NavItems }}
-      {{ if .ShowInNav }}<a href="{{ url_abs .Slug }}">{{ .Title }}</a>{{ end }}
-    {{ end }}
-    </nav>
-  {{ end }}
 </header>
 
 <main>

layouts/simplecss/templates/pages_single.html

@@ -1,2 +0,0 @@
-{{ if .Page.Title }}<h2>{{ .Page.Title }}</h2>{{ end }}
-{{ .HTML }}

layouts/simplecss/templates/posts_list.html

@@ -8,7 +8,7 @@
 {{ end }}
 {{ if or .PrevURL .NextURL }}
 <nav class="pagination">
-  {{ if .PrevURL }}<a href="{{ url_abs .PrevURL }}">← Newer posts</a>{{ end }}
+  {{ if .PrevURL }}<a href="{{ .PrevURL }}">← Newer posts</a>{{ end }}
-  {{ if .NextURL }}<a href="{{ url_abs .NextURL }}">Older posts →</a>{{ end }}
+  {{ if .NextURL }}<a href="{{ .NextURL }}">Older posts →</a>{{ end }}
 </nav>
 {{ end }}

models/errors.go

@@ -7,5 +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 record with this slug already exists")
+var SlugConflictError = errors.New("a category with this slug already exists")
-var UnsupportedImageFormat = errors.New("unsupported image format")

models/imgedit.go

@@ -1,62 +0,0 @@
-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 {
-	ID    string          `json:"id"`
-	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(ieh.ID)
-	sb.WriteString("-")
-	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"`
-}

models/pages.go

@@ -1,45 +0,0 @@
-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, "-")
-}

models/pages_test.go

@@ -1,26 +0,0 @@
-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))
-		})
-	}
-}

models/pubmodel/sites.go

@@ -6,7 +6,6 @@ import (
 	"iter"
 
 	"lmika.dev/lmika/weiro/models"
-	"lmika.dev/pkg/modash/moslice"
 )
 
 type Site struct {
@@ -19,9 +18,4 @@ 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
-}
-
-func (s Site) NavItems() []*models.Page {
-	return moslice.Filter(s.Pages, func(p *models.Page) bool { return p.ShowInNav })
 }

package-lock.json

@@ -7,9 +7,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",
-        "handlebars": "^4.7.8"
       },
       "devDependencies": {
         "esbuild": "0.27.3"
@@ -785,12 +783,6 @@
         "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",
@@ -798,17 +790,6 @@
       "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",
@@ -874,16 +855,6 @@
         "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",
@@ -893,27 +864,6 @@
         "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",
@@ -937,9 +887,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.5",
+      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
-      "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
+      "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==",
       "license": "MIT"
     },
     "node_modules/is-core-module": {
@@ -980,21 +930,6 @@
         "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",
@@ -1432,15 +1367,6 @@
         "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",
@@ -1508,31 +1434,12 @@
       "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"
     }
   }
 }

package.json

@@ -5,8 +5,6 @@
   "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",
-    "handlebars": "^4.7.8"
   }
 }

providers/db/categories.go

@@ -82,8 +82,8 @@ func (db *Provider) SelectCategoriesOfPost(ctx context.Context, postID int64) ([
 	return cats, nil
 }
 
-func (db *Provider) SelectPublishedPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) {
+func (db *Provider) SelectPostsOfCategory(ctx context.Context, categoryID int64, pp PagingParams) ([]*models.Post, error) {
-	rows, err := db.queries.SelectPublishedPostsOfCategory(ctx, sqlgen.SelectPublishedPostsOfCategoryParams{
+	rows, err := db.queries.SelectPostsOfCategory(ctx, sqlgen.SelectPostsOfCategoryParams{
 		CategoryID: categoryID,
 		Limit:      pp.Limit,
 		Offset:     pp.Offset,

providers/db/gen/sqlgen/categories.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: categories.sql
 
 package sqlgen
@@ -227,7 +227,7 @@ func (q *Queries) SelectCategoryBySlugAndSite(ctx context.Context, arg SelectCat
 	return i, err
 }
 
-const selectPublishedPostsOfCategory = `-- name: SelectPublishedPostsOfCategory :many
+const selectPostsOfCategory = `-- name: SelectPostsOfCategory :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 SelectPublishedPostsOfCategoryParams struct {
+type SelectPostsOfCategoryParams struct {
 	CategoryID int64
 	Limit      int64
 	Offset     int64
 }
 
-func (q *Queries) SelectPublishedPostsOfCategory(ctx context.Context, arg SelectPublishedPostsOfCategoryParams) ([]Post, error) {
+func (q *Queries) SelectPostsOfCategory(ctx context.Context, arg SelectPostsOfCategoryParams) ([]Post, error) {
-	rows, err := q.db.QueryContext(ctx, selectPublishedPostsOfCategory, arg.CategoryID, arg.Limit, arg.Offset)
+	rows, err := q.db.QueryContext(ctx, selectPostsOfCategory, arg.CategoryID, arg.Limit, arg.Offset)
 	if err != nil {
 		return nil, err
 	}

providers/db/gen/sqlgen/db.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 
 package sqlgen
 

providers/db/gen/sqlgen/models.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 
 package sqlgen
 
@@ -15,20 +15,6 @@ 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

providers/db/gen/sqlgen/pages.sql.go

@@ -1,219 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.30.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
-}

providers/db/gen/sqlgen/pending_uploads.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: pending_uploads.sql
 
 package sqlgen

providers/db/gen/sqlgen/posts.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: posts.sql
 
 package sqlgen
@@ -200,54 +200,6 @@ 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 = ?
 `

providers/db/gen/sqlgen/pubtargets.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: pubtargets.sql
 
 package sqlgen

providers/db/gen/sqlgen/sites.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: sites.sql
 
 package sqlgen

providers/db/gen/sqlgen/uploads.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.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 :one
+const insertUpload = `-- name: InsertUpload :exec
 INSERT INTO uploads (
     site_id,
     guid,
@@ -43,8 +43,8 @@ type InsertUploadParams struct {
 	CreatedAt int64
 }
 
-func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) (int64, error) {
+func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) error {
-	row := q.db.QueryRowContext(ctx, insertUpload,
+	_, err := q.db.ExecContext(ctx, insertUpload,
 		arg.SiteID,
 		arg.Guid,
 		arg.MimeType,
@@ -54,9 +54,7 @@ func (q *Queries) InsertUpload(ctx context.Context, arg InsertUploadParams) (int
 		arg.Alt,
 		arg.CreatedAt,
 	)
-	var id int64
+	return err
-	err := row.Scan(&id)
-	return id, err
 }
 
 const selectUploadByID = `-- name: SelectUploadByID :one
@@ -156,17 +154,3 @@ 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
-}

providers/db/gen/sqlgen/users.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.28.0
 // source: users.sql
 
 package sqlgen

providers/db/pages.go

@@ -1,115 +0,0 @@
-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(),
-	}
-}

providers/db/posts.go

@@ -47,23 +47,6 @@ 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 {

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 {
-		newID, err := db.queries.InsertUpload(ctx, sqlgen.InsertUploadParams{
+		if err := db.queries.InsertUpload(ctx, sqlgen.InsertUploadParams{
 			SiteID:    upload.SiteID,
 			Guid:      upload.GUID,
 			MimeType:  upload.MIMEType,
@@ -53,11 +53,9 @@ 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
 	}
 
@@ -67,13 +65,6 @@ 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)
 }

providers/markdown/renderer.go

@@ -22,7 +22,7 @@ type Renderer struct {
 
 func NewRendererForUI() *Renderer {
 	mdParser := goldmark.New(
-		goldmark.WithExtensions(extension.GFM, extension.Footnote),
+		goldmark.WithExtensions(extension.GFM),
 		goldmark.WithRendererOptions(
 			gm_html.WithUnsafe(),
 		),
@@ -48,7 +48,7 @@ func NewRendererForUI() *Renderer {
 
 func NewRendererForSite() *Renderer {
 	mdParser := goldmark.New(
-		goldmark.WithExtensions(extension.GFM, extension.Footnote),
+		goldmark.WithExtensions(extension.GFM),
 		goldmark.WithParserOptions(
 			parser.WithAutoHeadingID(),
 		),

providers/sitebuilder/builder.go

@@ -49,7 +49,6 @@ func New(site pubmodel.Site, opts Options) (*Builder, error) {
 		mdRenderer: markdown.NewRendererForSite(),
 		postMDProcessors: []postMDProcessor{
 			uploadAbsoluteURL,
-			removeFootnoteHRs,
 		},
 	}, nil
 }
@@ -119,12 +118,7 @@ func (b *Builder) BuildSite(outDir string) error {
 	// Build static assets
 	eg.Go(func() error { return b.writeStaticAssets(buildCtx) })
 
-	if err := eg.Wait(); err != nil {
+	return eg.Wait()
-		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 {
@@ -167,10 +161,14 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co
 
 		var prevURL, nextURL string
 		if page > 1 {
-			prevURL = fmt.Sprintf("%v/%d", b.opts.BasePostList, page-1)
+			if page == 2 {
+				prevURL = "/posts/"
+			} else {
+				prevURL = fmt.Sprintf("/posts/%d/", page-1)
+			}
 		}
 		if page < totalPages {
-			nextURL = fmt.Sprintf("%v/%d", b.opts.BasePostList, page+1)
+			nextURL = fmt.Sprintf("/posts/%d/", page+1)
 		}
 
 		pl := postListData{
@@ -184,9 +182,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{"", fmt.Sprintf("%v/1", b.opts.BasePostList)}
+			paths = []string{"", "/posts"}
 		} else {
-			paths = []string{fmt.Sprintf("%v/%d", b.opts.BasePostList, page)}
+			paths = []string{fmt.Sprintf("/posts/%d", page)}
 		}
 
 		for _, path := range paths {

providers/sitebuilder/builder_test.go

@@ -22,7 +22,6 @@ func TestBuilder_BuildSite(t *testing.T) {
 			"layout_main.html":       {Data: []byte(`{{ .Body }}`)},
 			"categories_list.html":   {Data: []byte(`{{ range .Categories}}<a href="{{url_abs .Path}}">{{.Name}}</a>,{{ end }}`)},
 			"categories_single.html": {Data: []byte(`<h2>{{.Category.Name}}</h2>`)},
-			"pages_single.html":      {Data: []byte(`{{ if .Page.Title }}<h2>{{ .Page.Title }}</h2>{{ end }}{{ .HTML }}`)},
 		}
 
 		posts := []*models.Post{
@@ -50,15 +49,11 @@ 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":    "<p>This is a test post</p>\n",
 			"2026/02/20/another-post/index.html": "<p>This is <strong>another</strong> test post</p>\n",
 			"index.html":                         "<a href=\"https://example.com/2026/02/18/test-post\">Test Post</a>,<a href=\"https://example.com/2026/02/20/another-post\">Another Post</a>,",
-			"about/index.html":                   "<h2>About</h2><p>About this site</p>\n",
 		}
 
 		outDir := t.TempDir()

providers/sitebuilder/processors.go

@@ -35,8 +35,3 @@ 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
-}

providers/sitebuilder/render_pages.go

@@ -1,31 +0,0 @@
-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
-}

providers/sitebuilder/tmpls.go

@@ -26,14 +26,10 @@ 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 {
 	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.
 
@@ -96,9 +92,3 @@ type categorySingleData struct {
 	PrevURL         string
 	NextURL         string
 }
-
-type pageSingleData struct {
-	commonData
-	Page *models.Page
-	HTML template.HTML
-}

providers/uploadfiles/provider.go

@@ -66,11 +66,6 @@ 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)

services/imgedit/processing.go

@@ -1,171 +0,0 @@
-package imgedit
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"image"
-	"image/color"
-	"os"
-	"path/filepath"
-
-	"github.com/disintegration/imaging"
-	"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,string"`
-}
-
-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)
-
-			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
-		},
-	},
-}
-
-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)
-	}
-
-	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 {
-	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
-}
-
-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
-}

services/imgedit/service.go

@@ -1,266 +0,0 @@
-package imgedit
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"time"
-
-	"lmika.dev/lmika/weiro/models"
-	"lmika.dev/lmika/weiro/services/uploads"
-	"lmika.dev/pkg/modash/moslice"
-)
-
-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) NewSession(ctx context.Context, baseUploadID int64) (*models.ImageEditSession, error) {
-	site, user, err := s.fetchSiteAndUser(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	upload, _, err := s.uploadService.OpenUpload(ctx, baseUploadID)
-	if err != nil {
-		return nil, err
-	}
-
-	var ext string
-	switch upload.MIMEType {
-	case "image/jpeg":
-		ext = "jpg"
-	case "image/png":
-		ext = "png"
-	default:
-		return nil, 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{
-			{
-				ID:    models.NewNanoID(),
-				Type:  "copy-upload",
-				Props: mustToJSON(models.CopyUploadProps{UploadID: baseUploadID}),
-			},
-		},
-	}
-
-	newSession.RecalcVersionIDs()
-	if err := s.sessionStore.save(&newSession); err != nil {
-		return nil, err
-	}
-
-	if _, err := s.reprocess(ctx, &newSession); err != nil {
-		return nil, err
-	}
-
-	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
-	}
-
-	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,
-		Props: paramBytes,
-	})
-
-	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) 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
-}
-
-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
-}
-
-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 {
-		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) {
-	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
-}

services/imgedit/shadow.go

@@ -1,35 +0,0 @@
-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
-}

services/imgedit/store.go

@@ -1,70 +0,0 @@
-package imgedit
-
-import (
-	"encoding/json"
-	"io"
-	"os"
-	"path/filepath"
-
-	"lmika.dev/lmika/weiro/models"
-)
-
-type sessionStore struct {
-	baseDir string
-}
-
-func (ss *sessionStore) save(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 nil, err
-	}
-
-	sessionData := models.ImageEditSession{}
-	if err := json.Unmarshal(sessionDataBts, &sessionData); err != nil {
-		return nil, err
-	}
-
-	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 {
-		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
-}

services/pages/service.go

@@ -1,198 +0,0 @@
-package pages
-
-import (
-	"context"
-	"strings"
-	"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)
-	}
-
-	if !strings.HasPrefix(slug, "/") {
-		slug = "/" + slug
-	}
-
-	// 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)
-	}
-
-	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
-	} 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
-}

services/publisher/iter.go

@@ -9,10 +9,10 @@ import (
 )
 
 // postIter returns a post iterator which returns posts in reverse chronological order.
-func (s *Publisher) publishedPostIter(ctx context.Context, site int64) iter.Seq[models.Maybe[*models.Post]] {
+func (s *Publisher) postIter(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.SelectPublishedPostsOfSite(ctx, site, paging)
+		page, err := s.db.SelectPostsOfSite(ctx, site, false, 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.SelectPublishedPostsOfCategory(ctx, categoryID, paging)
+			page, err := s.db.SelectPostsOfCategory(ctx, categoryID, paging)
 			if err != nil {
 				yield(models.Maybe[*models.Post]{Err: err})
 				return

services/publisher/service.go

@@ -65,12 +65,6 @@ 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
@@ -79,7 +73,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.publishedPostIter(ctx, site.ID)
+				return p.postIter(ctx, site.ID)
 			},
 			BaseURL:    target.BaseURL,
 			Uploads:    uploads,
@@ -90,7 +84,6 @@ 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)
 			},
@@ -122,7 +115,6 @@ func (p *Publisher) publishSite(ctx context.Context, pubSite pubmodel.Site, targ
 
 	sb, err := sitebuilder.New(pubSite, sitebuilder.Options{
 		BasePosts:   "/posts",
-		BasePostList: "/pages",
 		BaseUploads: "/uploads",
 		BaseStatic:  "/static",
 		TemplatesFS: templateFS,

services/services.go

@@ -8,8 +8,6 @@ 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"
 	"lmika.dev/lmika/weiro/services/sites"
@@ -24,9 +22,7 @@ type Services struct {
 	Posts          *posts.Service
 	Sites          *sites.Service
 	Uploads        *uploads.Service
-	ImageEdit      *imgedit.Service
 	Categories     *categories.Service
-	Pages          *pages.Service
 }
 
 func New(cfg config.Config) (*Services, error) {
@@ -43,9 +39,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)
 
 	return &Services{
 		DB:             dbp,
@@ -55,9 +49,7 @@ func New(cfg config.Config) (*Services, error) {
 		Posts:          postService,
 		Sites:          siteService,
 		Uploads:        uploadService,
-		ImageEdit:      imageEditService,
 		Categories:     categoriesService,
-		Pages:          pagesService,
 	}, nil
 }
 

services/sites/services.go

@@ -9,7 +9,6 @@ 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 {
@@ -26,22 +25,6 @@ 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 {
@@ -53,20 +36,16 @@ func (s *Service) BestSite(ctx context.Context, user models.User) (models.Site,
 	return sites[0], nil
 }
 
-type CreateSiteParams struct {
+type FirstRunRequest struct {
+	Username      string `form:"username"`
+	Password1     string `form:"password1"`
+	Password2     string `form:"password2"`
 	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)),
@@ -97,31 +76,16 @@ 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:      user.ID,
+		OwnerID:      newUser.ID,
 		Timezone:     "UTC",
 		PostsPerPage: 10,
 		Created:      time.Now(),
 	}
 	if err := s.db.SaveSite(ctx, &newSite); err != nil {
-		return newSite, err
+		return newUser, newSite, err
 	}
 
 	hasNetlifyConfig := req.SiteURL != "" && req.NetlifySiteID != "" && req.NetlifyAPIKey != ""
@@ -136,11 +100,11 @@ func (s *Service) CreateSite(ctx context.Context, req CreateSiteParams) (newSite
 			TargetKey:  req.NetlifyAPIKey,
 		}
 		if err := s.db.SavePublishTarget(ctx, &target); err != nil {
-			return newSite, err
+			return newUser, newSite, err
 		}
 	}
 
-	return newSite, nil
+	return newUser, newSite, nil
 }
 
 func (s *Service) GetSiteByID(ctx context.Context, siteID int64) (models.Site, error) {
@@ -202,17 +166,3 @@ 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
-}

services/uploads/manage.go

@@ -6,10 +6,7 @@ import (
 	"html/template"
 	"io"
 	"log"
-	"os"
-	"path/filepath"
 	"strings"
-	"time"
 
 	"lmika.dev/lmika/weiro/models"
 )
@@ -70,75 +67,6 @@ 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 {

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: SelectPublishedPostsOfCategory :many
+-- name: SelectPostsOfCategory :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

sql/queries/pages.sql

@@ -1,34 +0,0 @@
--- 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 = ?;

sql/queries/posts.sql

@@ -17,12 +17,6 @@ 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;
 

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 :one
+-- name: InsertUpload :exec
 INSERT INTO uploads (
     site_id,
     guid,
@@ -23,8 +23,5 @@ 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 = ?;

sql/schema/06_pages.up.sql

@@ -1,17 +0,0 @@
-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);

views/_common/nav.html

@@ -11,14 +11,11 @@
           <a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/posts">Posts</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/pages">Pages</a>
+          <a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/categories">Categories</a>
         </li>
         <li class="nav-item">
           <a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/uploads">Uploads</a>
         </li>
-        <li class="nav-item">
-          <a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/categories">Categories</a>
-        </li>
         <li class="nav-item">
           <a class="nav-link active" aria-current="page" href="/sites/{{.site.ID}}/settings">Settings</a>
         </li>
@@ -29,25 +26,7 @@
           <span class="visually-hidden">Publishing...</span>
         </div>
         -->
-        <div class="nav-item dropdown me-2">
+
-          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            {{ .site.Title }}
-          </a>
-          <ul class="dropdown-menu dropdown-menu-end">
-            {{ range .allSites }}
-              <li><a class="dropdown-item" href="/sites/{{.ID}}/posts">{{.Title}}</a></li>
-            {{ end }}
-            <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" href="/sites/new">New Site…</a></li>
-          </ul>
-        </div>
-        <div class="nav-item dropdown border-end me-3">
-          {{ if .pubTarget }}
-            <a href="{{.pubTarget.BaseURL}}" class="nav-link navbar-site-visit" target="_blank" title="Visit site">
-              <i data-feather="external-link" width="18" height="18"></i>
-            </a>
-          {{ end }}
-        </div>
         <div class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
             {{ .user.Username }}

views/index/first-run.html

@@ -26,7 +26,7 @@
     </div>
     <div data-first-run-target="pages">
       <div class="text-center mb-4">
-        <p>Enter the details of your blog if you know them.<br>All fields are optional and can be changed later.</p>
+        <p>Enter the details of your blog, if you know them.<br>All fields are optional, and can be changed later.</p>
       </div>
       <div class="mb-2">
         <label for="siteName" class="form-label">Site Name</label>

views/pages/edit.html

@@ -1,55 +0,0 @@
-<main class="flex-grow-1 position-relative">
-  {{ if .isNew }}
-    <form method="post" class="container-fluid post-form py-2" action="/sites/{{ .site.ID }}/pages">
-  {{ else }}
-    <form method="post" class="container-fluid post-form py-2" action="/sites/{{ .site.ID }}/pages/{{ .page.ID }}">
-  {{ end }}
-    <input type="hidden" name="guid" value="{{ .page.GUID }}">
-    <div class="row">
-      <div class="col-md-9">
-        <div class="mb-2">
-          <input type="text" name="title" class="form-control" placeholder="Title" value="{{ .page.Title }}">
-        </div>
-        <textarea name="body" class="form-control flex-grow-1" rows="20">{{ .page.Body }}</textarea>
-        <div class="mt-2">
-          <button type="submit" class="btn btn-primary">{{ if .isNew }}Create{{ else }}Save{{ end }}</button>
-          {{ if not .isNew }}
-            <button type="button" class="btn btn-outline-danger ms-2"
-                    onclick="if(confirm('Delete this page?')) { document.getElementById('delete-form').submit(); }">Delete</button>
-          {{ end }}
-        </div>
-      </div>
-      <div class="col-md-3">
-        <div class="card mb-3">
-          <div class="card-header">Navigation</div>
-          <div class="card-body">
-            <div class="mb-3">
-              <label for="pageSlug" class="form-label">Slug</label>
-              <input type="text" class="form-control" id="pageSlug" name="slug" value="{{ .page.Slug }}" placeholder="Leave blank to generate">
-            </div>
-            <div class="form-check">
-              <input class="form-check-input" type="checkbox" name="show_in_nav" value="true" id="showInNav"
-                     {{ if .page.ShowInNav }}checked{{ end }}>
-              <label class="form-check-label" for="showInNav">Show in Nav</label>
-            </div>
-          </div>
-        </div>
-        <div class="card mb-3">
-          <div class="card-header">Page Settings</div>
-          <div class="card-body">
-            <div class="mb-3">
-              <label for="pageType" class="form-label">Page Type</label>
-              <select class="form-select" id="pageType" name="page_type">
-                <option value="0" {{ if eq .page.PageType 0 }}selected{{ end }}>Normal</option>
-              </select>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </form>
-
-  {{ if not .isNew }}
-    <form id="delete-form" method="post" action="/sites/{{ .site.ID }}/pages/{{ .page.ID }}/delete" style="display:none;"></form>
-  {{ end }}
-</main>

views/pages/index.html

@@ -1,35 +0,0 @@
-<main class="container">
-  <div class="my-4 d-flex justify-content-between align-items-baseline">
-    <div>
-      <a href="/sites/{{ .site.ID }}/pages/new" class="btn btn-success">New Page</a>
-    </div>
-  </div>
-
-  {{ if .pages }}
-    <table class="table" data-controller="pagelist" data-pagelist-site-id-value="{{ .site.ID }}">
-      <thead>
-        <tr>
-          <th style="width: 2rem;"></th>
-          <th>Title</th>
-          <th>Slug</th>
-          <th>Nav</th>
-        </tr>
-      </thead>
-      <tbody data-pagelist-target="list">
-        {{ range .pages }}
-          <tr draggable="true" data-page-id="{{ .ID }}"
-              data-action="dragstart->pagelist#dragStart dragover->pagelist#dragOver drop->pagelist#drop dragend->pagelist#dragEnd">
-            <td class="text-muted" style="cursor: grab;">&#x2630;</td>
-            <td><a href="/sites/{{ $.site.ID }}/pages/{{ .ID }}">{{ .Title }}</a></td>
-            <td><code>{{ .Slug }}</code></td>
-            <td>{{ if .ShowInNav }}Yes{{ end }}</td>
-          </tr>
-        {{ end }}
-      </tbody>
-    </table>
-  {{ else }}
-    <div class="h4 m-3 text-center">
-      <div class="position-absolute top-50 start-50 translate-middle">📄<br>No pages yet.</div>
-    </div>
-  {{ end }}
-</main>

views/posts/edit.html

@@ -1,5 +1,5 @@
 {{ $isPublished := ne .post.State 1 }}
-<main class="flex-grow-1 position-relative post-edit-page">
+<main class="flex-grow-1 position-relative">
   <form action="/sites/{{.site.ID}}/posts" method="post" class="container-fluid post-form py-2"
     data-controller="postedit"
         data-action="keydown.meta+s->postedit#save keydown.meta+enter->postedit#publish"
@@ -11,12 +11,12 @@
           <input type="text" name="title" class="form-control" placeholder="Title" value="{{ .post.Title }}">
         </div>
         <textarea data-postedit-target="bodyTextEdit" name="body" class="form-control flex-grow-1" rows="3">{{.post.Body}}</textarea>
-        <div class="mt-2">
+        <div>
           {{ if $isPublished }}
-            <input type="submit" name="action" class="btn btn-primary" value="Update">
+            <input type="submit" name="action" class="btn btn-primary mt-2" value="Update">
           {{ else }}
-            <input type="submit" name="action" class="btn btn-primary" value="Publish">
+            <input type="submit" name="action" class="btn btn-primary mt-2" value="Publish">
-            <input type="submit" name="action" class="btn btn-secondary" value="Save Draft">
+            <input type="submit" name="action" class="btn btn-secondary mt-2" value="Save Draft">
           {{ end }}
         </div>
       </div>

views/sitesettings/new.html

@@ -1,29 +0,0 @@
-<div class="mx-auto p-2" style="width: 400px; margin-block-start: 50px;" data-controller="first-run">
-  <div class="text-center mb-4">
-    <h1>New Site</h1>
-  </div>
-  <form action="/sites" method="post">
-    <div class="text-center mb-4">
-      <p>Enter the details of your blog if you know them.<br>All fields are optional and can be changed later.</p>
-    </div>
-    <div class="mb-2">
-      <label for="siteName" class="form-label">Site Name</label>
-      <input type="text" class="form-control" name="siteName" id="siteName">
-    </div>
-    <div class="mb-3">
-      <label for="siteUrl" class="form-label">Site URL</label>
-      <input type="text" class="form-control" name="siteUrl" id="siteUrl">
-    </div>
-    <div class="mb-3">
-      <label for="netlifySiteId" class="form-label">Netlify Site ID</label>
-      <input type="text" class="form-control" name="netlifySiteId" id="netlifySiteId">
-    </div>
-    <div class="mb-3">
-      <label for="netlifyAPIToken" class="form-label">Netlify API Token</label>
-      <input type="text" class="form-control" name="netlifyAPIToken" id="netlifyAPIToken">
-    </div>
-    <div class="mb-3 text-end">
-      <input type="submit" class="btn btn-primary" value="Create Site">
-    </div>
-  </form>
-</div>

views/uploads/edit.html

@@ -1,31 +0,0 @@
-<main class="flex-grow-1 flex-shrink-1"
-    data-controller="edit-upload"
-    data-edit-upload-site-id-value="{{ .site.ID }}"
-    data-edit-upload-upload-id-value="{{ .upload.Upload.ID }}"
->
-  <div class="flex-grow-1 flex-shrink-1 d-flex flex-column">
-    <div class="row flex-grow-1 flex-shrink-1 m-0">
-      <figure class="col-md-9 p-3">
-        <img data-edit-upload-target="preview" src="{{ .upload.URL }}" alt="{{ .upload.Upload.Alt }}" class="img-fluid" style="max-height: 80vw;">
-      </figure>
-      <div class="col-md-3 p-3">
-        <div data-edit-upload-target="processList"></div>
-
-        <div class="text-center">
-          <div class="dropdown">
-            <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-              Add Processor
-            </button>
-            <ul class="dropdown-menu">
-              <li><a class="dropdown-item" href="#" data-action="edit-upload#addProcessor">Shadow</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="col-md-9 m-3">
-    <button class="btn btn-primary" data-action="edit-upload#saveUpload">Save</button>
-    <button class="btn btn-secondary" data-action="edit-upload#saveNewUpload">Save as Copy</button>
-  </div>
-</main>

views/uploads/index.html

@@ -20,9 +20,5 @@
         </div>
       {{ end }}
     </div>
-  {{ else }}
-  <div class="h4 m-3 text-center">
-    <div class="position-absolute top-50 start-50 translate-middle">🖼️<br>No uploads yet.</div>
-  </div>
   {{ end }}
 </main>

views/uploads/show.html

@@ -5,10 +5,7 @@
        data-show-upload-site-id-value="{{ .upload.Upload.SiteID }}"
        data-show-upload-upload-id-value="{{ .upload.Upload.ID }}">
     <button class="btn btn-outline-dark" data-action="show-upload#copy">Copy HTML</button>
-    <span>
-      <a href="/sites/{{ .site.ID }}/uploads/{{ .upload.Upload.ID }}/edit" class="btn btn-secondary">Edit</a>
     <button class="btn btn-danger" data-action="show-upload#delete">Delete</button>
-    </span>
   </div>
 
   <figure>