Compare commits

..

No commits in common. "40da63368a37c9651497c51b3896846dcad195bb" and "7c4dc0885e444f7ce95571dd572765e90f9bf87d" have entirely different histories.

21 changed files with 91 additions and 412 deletions

View file

@ -6,7 +6,6 @@ import (
"github.com/gofiber/fiber/v3" "github.com/gofiber/fiber/v3"
"lmika.dev/lmika/weiro/models" "lmika.dev/lmika/weiro/models"
"lmika.dev/lmika/weiro/providers/db"
"lmika.dev/lmika/weiro/services/categories" "lmika.dev/lmika/weiro/services/categories"
"lmika.dev/lmika/weiro/services/posts" "lmika.dev/lmika/weiro/services/posts"
) )
@ -19,43 +18,22 @@ type PostsHandler struct {
func (ph PostsHandler) Index(c fiber.Ctx) error { func (ph PostsHandler) Index(c fiber.Ctx) error {
var req struct { var req struct {
Filter string `query:"filter"` Filter string `query:"filter"`
Page int `query:"page"`
} }
if err := c.Bind().Query(&req); err != nil { if err := c.Bind().Query(&req); err != nil {
return fiber.ErrBadRequest return fiber.ErrBadRequest
} }
const perPage = 25 posts, err := ph.PostService.ListPosts(c.Context(), req.Filter == "deleted")
if req.Page < 1 {
req.Page = 1
}
result, err := ph.PostService.ListPosts(c.Context(), req.Filter == "deleted", db.PagingParams{
Offset: int64((req.Page - 1) * perPage),
Limit: perPage,
})
if err != nil { if err != nil {
return err return err
} }
totalPages := int(result.TotalCount+int64(perPage)-1) / perPage
if totalPages < 1 {
totalPages = 1
}
pageInfo := models.PageInfo{
CurrentPage: req.Page,
TotalPages: totalPages,
PostsPerPage: perPage,
}
return accepts(c, json(func() any { return accepts(c, json(func() any {
return result.Posts return posts
}), html(func(c fiber.Ctx) error { }), html(func(c fiber.Ctx) error {
return c.Render("posts/index", fiber.Map{ return c.Render("posts/index", fiber.Map{
"req": req, "req": req,
"posts": result.Posts, "posts": posts,
"pageInfo": pageInfo,
}) })
})) }))
} }

View file

@ -9,9 +9,3 @@
{{ template "_post_meta.html" . }} {{ template "_post_meta.html" . }}
</div> </div>
{{ end }} {{ end }}
{{ if or .PrevURL .NextURL }}
<nav class="pagination">
{{ if .PrevURL }}<a href="{{ .PrevURL }}">← Newer posts</a>{{ end }}
{{ if .NextURL }}<a href="{{ .NextURL }}">Older posts →</a>{{ end }}
</nav>
{{ end }}

View file

@ -6,9 +6,3 @@
{{ template "_post_meta.html" . }} {{ template "_post_meta.html" . }}
</div> </div>
{{ end }} {{ end }}
{{ if or .PrevURL .NextURL }}
<nav class="pagination">
{{ if .PrevURL }}<a href="{{ .PrevURL }}">← Newer posts</a>{{ end }}
{{ if .NextURL }}<a href="{{ .NextURL }}">Older posts →</a>{{ end }}
</nav>
{{ end }}

View file

@ -1,37 +0,0 @@
package models
// PageInfo carries pagination state for templates.
type PageInfo struct {
CurrentPage int
TotalPages int
PostsPerPage int
}
// HasPrevious returns true if there is a previous page.
func (p PageInfo) HasPrevious() bool {
return p.CurrentPage > 1
}
// HasNext returns true if there is a next page.
func (p PageInfo) HasNext() bool {
return p.CurrentPage < p.TotalPages
}
// PreviousPage returns the previous page number.
func (p PageInfo) PreviousPage() int {
return p.CurrentPage - 1
}
// NextPage returns the next page number.
func (p PageInfo) NextPage() int {
return p.CurrentPage + 1
}
// Pages returns a slice of page numbers for rendering numbered pagination.
func (p PageInfo) Pages() []int {
pages := make([]int, p.TotalPages)
for i := range pages {
pages[i] = i + 1
}
return pages
}

View file

@ -30,7 +30,6 @@ type Site struct {
Title string Title string
Tagline string Tagline string
Timezone string Timezone string
PostsPerPage int
} }
type SitePublishTarget struct { type SitePublishTarget struct {

View file

@ -64,7 +64,6 @@ type Site struct {
Tagline string Tagline string
CreatedAt int64 CreatedAt int64
Timezone string Timezone string
PostsPerPage int64
} }
type Upload struct { type Upload struct {

View file

@ -9,28 +9,6 @@ import (
"context" "context"
) )
const countPostsOfSite = `-- name: CountPostsOfSite :one
SELECT COUNT(*) FROM posts
WHERE site_id = ?1 AND (
CASE CAST (?2 AS TEXT)
WHEN 'deleted' THEN deleted_at > 0
ELSE deleted_at = 0
END
)
`
type CountPostsOfSiteParams struct {
SiteID int64
PostFilter string
}
func (q *Queries) CountPostsOfSite(ctx context.Context, arg CountPostsOfSiteParams) (int64, error) {
row := q.db.QueryRowContext(ctx, countPostsOfSite, arg.SiteID, arg.PostFilter)
var count int64
err := row.Scan(&count)
return count, err
}
const hardDeletePost = `-- name: HardDeletePost :exec const hardDeletePost = `-- name: HardDeletePost :exec
DELETE FROM posts WHERE id = ? DELETE FROM posts WHERE id = ?
` `

View file

@ -28,9 +28,8 @@ INSERT INTO sites (
title, title,
tagline, tagline,
timezone, timezone,
posts_per_page,
created_at created_at
) VALUES (?, ?, ?, ?, ?, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?)
RETURNING id RETURNING id
` `
@ -40,7 +39,6 @@ type InsertSiteParams struct {
Title string Title string
Tagline string Tagline string
Timezone string Timezone string
PostsPerPage int64
CreatedAt int64 CreatedAt int64
} }
@ -51,7 +49,6 @@ func (q *Queries) InsertSite(ctx context.Context, arg InsertSiteParams) (int64,
arg.Title, arg.Title,
arg.Tagline, arg.Tagline,
arg.Timezone, arg.Timezone,
arg.PostsPerPage,
arg.CreatedAt, arg.CreatedAt,
) )
var id int64 var id int64
@ -104,7 +101,7 @@ func (q *Queries) SelectAllSitesWithOwners(ctx context.Context) ([]SelectAllSite
} }
const selectSiteByGUID = `-- name: SelectSiteByGUID :one const selectSiteByGUID = `-- name: SelectSiteByGUID :one
SELECT id, owner_id, guid, title, tagline, created_at, timezone, posts_per_page FROM sites WHERE guid = ? SELECT id, owner_id, guid, title, tagline, created_at, timezone FROM sites WHERE guid = ?
` `
func (q *Queries) SelectSiteByGUID(ctx context.Context, guid string) (Site, error) { func (q *Queries) SelectSiteByGUID(ctx context.Context, guid string) (Site, error) {
@ -118,13 +115,12 @@ func (q *Queries) SelectSiteByGUID(ctx context.Context, guid string) (Site, erro
&i.Tagline, &i.Tagline,
&i.CreatedAt, &i.CreatedAt,
&i.Timezone, &i.Timezone,
&i.PostsPerPage,
) )
return i, err return i, err
} }
const selectSiteByID = `-- name: SelectSiteByID :one const selectSiteByID = `-- name: SelectSiteByID :one
SELECT id, owner_id, guid, title, tagline, created_at, timezone, posts_per_page FROM sites WHERE id = ? SELECT id, owner_id, guid, title, tagline, created_at, timezone FROM sites WHERE id = ?
` `
func (q *Queries) SelectSiteByID(ctx context.Context, id int64) (Site, error) { func (q *Queries) SelectSiteByID(ctx context.Context, id int64) (Site, error) {
@ -138,13 +134,12 @@ func (q *Queries) SelectSiteByID(ctx context.Context, id int64) (Site, error) {
&i.Tagline, &i.Tagline,
&i.CreatedAt, &i.CreatedAt,
&i.Timezone, &i.Timezone,
&i.PostsPerPage,
) )
return i, err return i, err
} }
const selectSitesOwnedByUser = `-- name: SelectSitesOwnedByUser :many const selectSitesOwnedByUser = `-- name: SelectSitesOwnedByUser :many
SELECT id, owner_id, guid, title, tagline, created_at, timezone, posts_per_page FROM sites WHERE owner_id = ? ORDER BY title ASC SELECT id, owner_id, guid, title, tagline, created_at, timezone FROM sites WHERE owner_id = ? ORDER BY title ASC
` `
func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([]Site, error) { func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([]Site, error) {
@ -164,7 +159,6 @@ func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([]
&i.Tagline, &i.Tagline,
&i.CreatedAt, &i.CreatedAt,
&i.Timezone, &i.Timezone,
&i.PostsPerPage,
); err != nil { ); err != nil {
return nil, err return nil, err
} }
@ -180,14 +174,13 @@ func (q *Queries) SelectSitesOwnedByUser(ctx context.Context, ownerID int64) ([]
} }
const updateSite = `-- name: UpdateSite :exec const updateSite = `-- name: UpdateSite :exec
UPDATE sites SET title = ?, tagline = ?, timezone = ?, posts_per_page = ? WHERE id = ? UPDATE sites SET title = ?, tagline = ?, timezone = ? WHERE id = ?
` `
type UpdateSiteParams struct { type UpdateSiteParams struct {
Title string Title string
Tagline string Tagline string
Timezone string Timezone string
PostsPerPage int64
ID int64 ID int64
} }
@ -196,7 +189,6 @@ func (q *Queries) UpdateSite(ctx context.Context, arg UpdateSiteParams) error {
arg.Title, arg.Title,
arg.Tagline, arg.Tagline,
arg.Timezone, arg.Timezone,
arg.PostsPerPage,
arg.ID, arg.ID,
) )
return err return err

View file

@ -13,17 +13,6 @@ type PagingParams struct {
Offset int64 Offset int64
} }
func (db *Provider) CountPostsOfSite(ctx context.Context, siteID int64, showDeleted bool) (int64, error) {
filter := "active"
if showDeleted {
filter = "deleted"
}
return db.queries.CountPostsOfSite(ctx, sqlgen.CountPostsOfSiteParams{
SiteID: siteID,
PostFilter: filter,
})
}
func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDeleted bool, pp PagingParams) ([]*models.Post, error) { func (db *Provider) SelectPostsOfSite(ctx context.Context, siteID int64, showDeleted bool, pp PagingParams) ([]*models.Post, error) {
var filter = "" var filter = ""
if showDeleted { if showDeleted {

View file

@ -3,7 +3,6 @@ package db_test
import ( import (
"context" "context"
"encoding/base64" "encoding/base64"
"fmt"
"path/filepath" "path/filepath"
"testing" "testing"
"time" "time"
@ -230,45 +229,6 @@ func TestProvider_Posts(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
assert.Empty(t, posts) assert.Empty(t, posts)
}) })
t.Run("count posts of site", func(t *testing.T) {
countSite := &models.Site{
OwnerID: user.ID,
GUID: models.NewNanoID(),
Title: "Count Blog",
}
require.NoError(t, p.SaveSite(ctx, countSite))
now := time.Date(2026, 3, 22, 12, 0, 0, 0, time.UTC)
for i := 0; i < 3; i++ {
post := &models.Post{
SiteID: countSite.ID,
GUID: models.NewNanoID(),
Title: fmt.Sprintf("Post %d", i),
Body: "body",
Slug: fmt.Sprintf("/post-%d", i),
CreatedAt: now,
}
require.NoError(t, p.SavePost(ctx, post))
}
count, err := p.CountPostsOfSite(ctx, countSite.ID, false)
require.NoError(t, err)
assert.Equal(t, int64(3), count)
// Soft-delete one post
posts, err := p.SelectPostsOfSite(ctx, countSite.ID, false, db.PagingParams{Limit: 10, Offset: 0})
require.NoError(t, err)
require.NoError(t, p.SoftDeletePost(ctx, posts[0].ID))
count, err = p.CountPostsOfSite(ctx, countSite.ID, false)
require.NoError(t, err)
assert.Equal(t, int64(2), count)
count, err = p.CountPostsOfSite(ctx, countSite.ID, true)
require.NoError(t, err)
assert.Equal(t, int64(1), count)
})
} }
func TestProvider_PublishTargets(t *testing.T) { func TestProvider_PublishTargets(t *testing.T) {

View file

@ -47,7 +47,6 @@ func (db *Provider) SaveSite(ctx context.Context, site *models.Site) error {
Title: site.Title, Title: site.Title,
Tagline: site.Tagline, Tagline: site.Tagline,
Timezone: site.Timezone, Timezone: site.Timezone,
PostsPerPage: int64(site.PostsPerPage),
CreatedAt: timeToInt(site.Created), CreatedAt: timeToInt(site.Created),
}) })
if err != nil { if err != nil {
@ -61,7 +60,6 @@ func (db *Provider) SaveSite(ctx context.Context, site *models.Site) error {
Title: site.Title, Title: site.Title,
Tagline: site.Tagline, Tagline: site.Tagline,
Timezone: site.Timezone, Timezone: site.Timezone,
PostsPerPage: int64(site.PostsPerPage),
ID: site.ID, ID: site.ID,
}) })
} }
@ -109,7 +107,6 @@ func dbSiteToSite(row sqlgen.Site) models.Site {
Title: row.Title, Title: row.Title,
Timezone: row.Timezone, Timezone: row.Timezone,
Tagline: row.Tagline, Tagline: row.Tagline,
PostsPerPage: int(row.PostsPerPage),
Created: time.Unix(row.CreatedAt, 0).UTC(), Created: time.Unix(row.CreatedAt, 0).UTC(),
} }
} }

View file

@ -122,8 +122,7 @@ func (b *Builder) BuildSite(outDir string) error {
} }
func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Context) error { func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Context) error {
// Collect all posts var posts []postSingleData
var allPosts []postSingleData
for mp := range b.site.PostIter(ctx) { for mp := range b.site.PostIter(ctx) {
post, err := mp.Get() post, err := mp.Get()
if err != nil { if err != nil {
@ -133,70 +132,17 @@ func (b *Builder) renderPostListWithCategories(bctx buildContext, ctx context.Co
if err != nil { if err != nil {
return err return err
} }
allPosts = append(allPosts, rp) posts = append(posts, rp)
}
postsPerPage := b.site.PostsPerPage
if postsPerPage < 1 {
postsPerPage = 10
}
totalPages := (len(allPosts) + postsPerPage - 1) / postsPerPage
if totalPages < 1 {
totalPages = 1
}
for page := 1; page <= totalPages; page++ {
start := (page - 1) * postsPerPage
end := start + postsPerPage
if end > len(allPosts) {
end = len(allPosts)
}
pageInfo := models.PageInfo{
CurrentPage: page,
TotalPages: totalPages,
PostsPerPage: postsPerPage,
}
var prevURL, nextURL string
if page > 1 {
if page == 2 {
prevURL = "/posts/"
} else {
prevURL = fmt.Sprintf("/posts/page/%d/", page-1)
}
}
if page < totalPages {
nextURL = fmt.Sprintf("/posts/page/%d/", page+1)
} }
pl := postListData{ pl := postListData{
commonData: commonData{Site: b.site}, commonData: commonData{Site: b.site},
Posts: allPosts[start:end], Posts: posts,
PageInfo: pageInfo,
PrevURL: prevURL,
NextURL: nextURL,
} }
// Page 1 renders at both root and /posts/ return b.createAtPath(bctx, "", func(f io.Writer) error {
var paths []string
if page == 1 {
paths = []string{"", "/posts"}
} else {
paths = []string{fmt.Sprintf("/posts/page/%d", page)}
}
for _, path := range paths {
if err := b.createAtPath(bctx, path, func(f io.Writer) error {
return b.renderTemplate(f, tmplNamePostList, pl) return b.renderTemplate(f, tmplNamePostList, pl)
}); err != nil { })
return err
}
}
}
return nil
} }
func (b *Builder) renderFeeds(ctx buildContext, postIter iter.Seq[models.Maybe[*models.Post]], opts feedOptions) error { func (b *Builder) renderFeeds(ctx buildContext, postIter iter.Seq[models.Maybe[*models.Post]], opts feedOptions) error {
@ -372,8 +318,7 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e
continue continue
} }
// Collect all posts for this category var posts []postSingleData
var allPosts []postSingleData
for mp := range b.site.PostIterByCategory(goCtx, cwc.ID) { for mp := range b.site.PostIterByCategory(goCtx, cwc.ID) {
post, err := mp.Get() post, err := mp.Get()
if err != nil { if err != nil {
@ -383,7 +328,7 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e
if err != nil { if err != nil {
return err return err
} }
allPosts = append(allPosts, rp) posts = append(posts, rp)
} }
var descHTML bytes.Buffer var descHTML bytes.Buffer
@ -393,68 +338,22 @@ func (b *Builder) renderCategoryPages(ctx buildContext, goCtx context.Context) e
} }
} }
postsPerPage := b.site.PostsPerPage
if postsPerPage < 1 {
postsPerPage = 10
}
totalPages := (len(allPosts) + postsPerPage - 1) / postsPerPage
if totalPages < 1 {
totalPages = 1
}
basePath := fmt.Sprintf("/categories/%s", cwc.Slug)
for page := 1; page <= totalPages; page++ {
start := (page - 1) * postsPerPage
end := start + postsPerPage
if end > len(allPosts) {
end = len(allPosts)
}
pageInfo := models.PageInfo{
CurrentPage: page,
TotalPages: totalPages,
PostsPerPage: postsPerPage,
}
var prevURL, nextURL string
if page > 1 {
if page == 2 {
prevURL = basePath + "/"
} else {
prevURL = fmt.Sprintf("%s/page/%d/", basePath, page-1)
}
}
if page < totalPages {
nextURL = fmt.Sprintf("%s/page/%d/", basePath, page+1)
}
path := basePath
if page > 1 {
path = fmt.Sprintf("%s/page/%d", basePath, page)
}
data := categorySingleData{ data := categorySingleData{
commonData: commonData{Site: b.site}, commonData: commonData{Site: b.site},
Category: &cwc.Category, Category: &cwc.Category,
DescriptionHTML: template.HTML(descHTML.String()), DescriptionHTML: template.HTML(descHTML.String()),
Posts: allPosts[start:end], Posts: posts,
Path: path, Path: fmt.Sprintf("/categories/%s", cwc.Slug),
PageInfo: pageInfo,
PrevURL: prevURL,
NextURL: nextURL,
} }
if err := b.createAtPath(ctx, path, func(f io.Writer) error { if err := b.createAtPath(ctx, data.Path, func(f io.Writer) error {
return b.renderTemplate(f, tmplNameCategorySingle, data) return b.renderTemplate(f, tmplNameCategorySingle, data)
}); err != nil { }); err != nil {
return err return err
} }
}
// Per-category feeds (use all posts, not paginated) // Per-category feeds
if err := b.renderCategoryFeed(ctx, cwc, allPosts); err != nil { if err := b.renderCategoryFeed(ctx, cwc, posts); err != nil {
return err return err
} }
} }
@ -572,9 +471,6 @@ func (b *Builder) writeUploads(ctx buildContext, uploads []models.Upload) error
} }
func (b *Builder) writeStaticAssets(ctx buildContext) error { func (b *Builder) writeStaticAssets(ctx buildContext) error {
if b.opts.StaticFS == nil {
return nil
}
return fs.WalkDir(b.opts.StaticFS, ".", func(path string, d os.DirEntry, err error) error { return fs.WalkDir(b.opts.StaticFS, ".", func(path string, d os.DirEntry, err error) error {
if err != nil { if err != nil {
return err return err

View file

@ -38,7 +38,6 @@ func TestBuilder_BuildSite(t *testing.T) {
} }
site := pubmodel.Site{ site := pubmodel.Site{
Site: models.Site{PostsPerPage: 10},
BaseURL: "https://example.com", BaseURL: "https://example.com",
PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] { PostIter: func(ctx context.Context) iter.Seq[models.Maybe[*models.Post]] {
return func(yield func(models.Maybe[*models.Post]) bool) { return func(yield func(models.Maybe[*models.Post]) bool) {

View file

@ -62,9 +62,6 @@ type postSingleData struct {
type postListData struct { type postListData struct {
commonData commonData
Posts []postSingleData Posts []postSingleData
PageInfo models.PageInfo
PrevURL string
NextURL string
} }
type layoutData struct { type layoutData struct {
@ -88,7 +85,4 @@ type categorySingleData struct {
DescriptionHTML template.HTML DescriptionHTML template.HTML
Posts []postSingleData Posts []postSingleData
Path string Path string
PageInfo models.PageInfo
PrevURL string
NextURL string
} }

View file

@ -12,36 +12,29 @@ type PostWithCategories struct {
Categories []*models.Category Categories []*models.Category
} }
type ListPostsResult struct { func (s *Service) ListPosts(ctx context.Context, showDeleted bool) ([]*PostWithCategories, error) {
Posts []*PostWithCategories
TotalCount int64
}
func (s *Service) ListPosts(ctx context.Context, showDeleted bool, paging db.PagingParams) (ListPostsResult, error) {
site, ok := models.GetSite(ctx) site, ok := models.GetSite(ctx)
if !ok { if !ok {
return ListPostsResult{}, models.SiteRequiredError return nil, models.SiteRequiredError
} }
posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted, paging) posts, err := s.db.SelectPostsOfSite(ctx, site.ID, showDeleted, db.PagingParams{
Offset: 0,
Limit: 25,
})
if err != nil { if err != nil {
return ListPostsResult{}, err return nil, err
}
count, err := s.db.CountPostsOfSite(ctx, site.ID, showDeleted)
if err != nil {
return ListPostsResult{}, err
} }
result := make([]*PostWithCategories, len(posts)) result := make([]*PostWithCategories, len(posts))
for i, post := range posts { for i, post := range posts {
cats, err := s.db.SelectCategoriesOfPost(ctx, post.ID) cats, err := s.db.SelectCategoriesOfPost(ctx, post.ID)
if err != nil { if err != nil {
return ListPostsResult{}, err return nil, err
} }
result[i] = &PostWithCategories{Post: post, Categories: cats} result[i] = &PostWithCategories{Post: post, Categories: cats}
} }
return ListPostsResult{Posts: result, TotalCount: count}, nil return result, nil
} }
func (s *Service) GetPost(ctx context.Context, pid int64) (*models.Post, error) { func (s *Service) GetPost(ctx context.Context, pid int64) (*models.Post, error) {

View file

@ -81,7 +81,6 @@ func (s *Service) FirstRun(ctx context.Context, req FirstRunRequest) (newUser mo
GUID: models.NewNanoID(), GUID: models.NewNanoID(),
OwnerID: newUser.ID, OwnerID: newUser.ID,
Timezone: "UTC", Timezone: "UTC",
PostsPerPage: 10,
Created: time.Now(), Created: time.Now(),
} }
if err := s.db.SaveSite(ctx, &newSite); err != nil { if err := s.db.SaveSite(ctx, &newSite); err != nil {
@ -134,7 +133,6 @@ type UpdateSiteSettingsParams struct {
Name string `form:"name"` Name string `form:"name"`
Tagline string `form:"tagline"` Tagline string `form:"tagline"`
Timezone string `form:"timezone"` Timezone string `form:"timezone"`
PostsPerPage int `form:"postsPerPage"`
} }
func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSettingsParams) (models.Site, error) { func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSettingsParams) (models.Site, error) {
@ -148,17 +146,9 @@ func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSetti
return models.Site{}, errors.Wrap(err, "invalid timezone") return models.Site{}, errors.Wrap(err, "invalid timezone")
} }
postsPerPage := params.PostsPerPage
if postsPerPage < 1 {
postsPerPage = 1
} else if postsPerPage > 100 {
postsPerPage = 100
}
site.Title = params.Name site.Title = params.Name
site.Tagline = params.Tagline site.Tagline = params.Tagline
site.Timezone = params.Timezone site.Timezone = params.Timezone
site.PostsPerPage = postsPerPage
if err := s.db.SaveSite(ctx, &site); err != nil { if err := s.db.SaveSite(ctx, &site); err != nil {
return models.Site{}, err return models.Site{}, err

View file

@ -1,12 +1,3 @@
-- name: CountPostsOfSite :one
SELECT COUNT(*) FROM posts
WHERE site_id = sqlc.arg(site_id) AND (
CASE CAST (sqlc.arg(post_filter) AS TEXT)
WHEN 'deleted' THEN deleted_at > 0
ELSE deleted_at = 0
END
);
-- name: SelectPostsOfSite :many -- name: SelectPostsOfSite :many
SELECT * SELECT *
FROM posts FROM posts

View file

@ -14,16 +14,15 @@ INSERT INTO sites (
title, title,
tagline, tagline,
timezone, timezone,
posts_per_page,
created_at created_at
) VALUES (?, ?, ?, ?, ?, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?)
RETURNING id; RETURNING id;
-- name: HasUsersAndSites :one -- name: HasUsersAndSites :one
SELECT (SELECT COUNT(*) FROM users) > 0 AND (SELECT COUNT(*) FROM sites) > 0 AS has_users_and_sites; SELECT (SELECT COUNT(*) FROM users) > 0 AND (SELECT COUNT(*) FROM sites) > 0 AS has_users_and_sites;
-- name: UpdateSite :exec -- name: UpdateSite :exec
UPDATE sites SET title = ?, tagline = ?, timezone = ?, posts_per_page = ? WHERE id = ?; UPDATE sites SET title = ?, tagline = ?, timezone = ? WHERE id = ?;
-- name: SelectAllSitesWithOwners :many -- name: SelectAllSitesWithOwners :many
SELECT s.id, s.guid, s.title, s.owner_id, u.username SELECT s.id, s.guid, s.title, s.owner_id, u.username

View file

@ -1 +0,0 @@
ALTER TABLE sites ADD COLUMN posts_per_page INTEGER NOT NULL DEFAULT 10;

View file

@ -62,22 +62,4 @@
{{ end }} {{ end }}
</div> </div>
{{ end }} {{ end }}
{{ if gt .pageInfo.TotalPages 1 }}
<nav aria-label="Page navigation" class="my-4">
<ul class="pagination justify-content-center">
<li class="page-item{{ if not .pageInfo.HasPrevious }} disabled{{ end }}">
<a class="page-link" href="?page={{ .pageInfo.PreviousPage }}{{ if .req.Filter }}&filter={{ .req.Filter }}{{ end }}">Previous</a>
</li>
{{ range $p := .pageInfo.Pages }}
<li class="page-item{{ if eq $p $.pageInfo.CurrentPage }} active{{ end }}">
<a class="page-link" href="?page={{ $p }}{{ if $.req.Filter }}&filter={{ $.req.Filter }}{{ end }}">{{ $p }}</a>
</li>
{{ end }}
<li class="page-item{{ if not .pageInfo.HasNext }} disabled{{ end }}">
<a class="page-link" href="?page={{ .pageInfo.NextPage }}{{ if .req.Filter }}&filter={{ .req.Filter }}{{ end }}">Next</a>
</li>
</ul>
</nav>
{{ end }}
</main> </main>

View file

@ -41,13 +41,6 @@
</datalist> </datalist>
</div> </div>
</div> </div>
<div class="row mb-3">
<label for="postsPerPage" class="col-sm-3 col-form-label text-end">Posts Per Page</label>
<div class="col-sm-3">
<input type="number" class="form-control" id="postsPerPage" name="postsPerPage" value="{{ .site.PostsPerPage }}" min="1" max="100">
<div class="form-text">Number of posts per page on the generated site.</div>
</div>
</div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-sm-3"></div> <div class="col-sm-3"></div>
<div class="col-sm-9"><button type="submit" class="btn btn-primary">Save Settings</button></div> <div class="col-sm-9"><button type="submit" class="btn btn-primary">Save Settings</button></div>