all repos — homestead @ 02344e6cb41515516464de403e2eae1caac81e5c

Code for my website

switch from templ to gomponent

Alan Pearce
commit

02344e6cb41515516464de403e2eae1caac81e5c

parent

4034ac2a849b499364d82b902896ca899d946c3a

1 file changed, 15 insertions(+), 8 deletions(-)

changed files
M internal/builder/builder.go → internal/builder/builder.go
@@ -1,7 +1,6 @@
 package builder
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"os"

@@ -63,7 +62,6 @@ options *Options,
 	config *config.Config,
 	log *log.Logger,
 ) errors.E {
-	ctx := context.TODO()
 	buf := new(buffer.Buffer)
 	joinSource := joinSourcePath(options.Source)
 	storage := options.Storage

@@ -95,7 +93,7 @@ for _, post := range cc.Posts {
 		log.Debug("rendering post", "post", post.Basename)
 		sitemap.AddPath(post.URL, post.Date)
 		buf.Reset()
-		if err := templates.PostPage(siteSettings, post).Render(ctx, buf); err != nil {
+		if err := templates.PostPage(siteSettings, post).Render(buf); err != nil {
 			return errors.WithMessage(err, "could not render post")
 		}
 

@@ -106,7 +104,10 @@ }
 
 	log.Debug("rendering tags list")
 	buf.Reset()
-	if err := templates.TagsPage(siteSettings, "tags", mapset.Sorted(cc.Tags), "/tags").Render(ctx, buf); err != nil {
+	if err := templates.TagsPage(siteSettings, templates.TagsPageVars{
+		Title: "Tags",
+		Tags:  mapset.Sorted(cc.Tags),
+	}).Render(buf); err != nil {
 		return errors.WithStack(err)
 	}
 	if err := storage.Write("/tags/", "Tags", buf); err != nil {

@@ -124,7 +125,10 @@ }
 		log.Debug("rendering tags page", "tag", tag)
 		url := path.Join("/tags", tag) + "/"
 		buf.Reset()
-		if err := templates.TagPage(siteSettings, tag, matchingPosts, url).Render(ctx, buf); err != nil {
+		if err := templates.TagPage(siteSettings, templates.TagPageVars{
+			Tag:   tag,
+			Posts: matchingPosts,
+		}).Render(buf); err != nil {
 			return errors.WithStack(err)
 		}
 		if err = storage.Write(url, tag, buf); err != nil {

@@ -154,7 +158,9 @@ }
 
 	log.Debug("rendering list page")
 	buf.Reset()
-	if err := templates.ListPage(siteSettings, cc.Posts, path.Join("/", postDir)).Render(ctx, buf); err != nil {
+	if err := templates.ListPage(siteSettings, templates.ListPageVars{
+		Posts: cc.Posts,
+	}).Render(buf); err != nil {
 		return errors.WithStack(err)
 	}
 	if err := storage.Write(path.Join("/", postDir)+"/", "Posts", buf); err != nil {

@@ -194,11 +200,11 @@ if err := templates.Homepage(siteSettings, templates.HomepageVars{
 				Email: config.Email,
 				Me:    config.RelMe,
 				Posts: cc.Posts,
-			}, post).Render(ctx, buf); err != nil {
+			}, post).Render(buf); err != nil {
 				return errors.WithStack(err)
 			}
 		} else {
-			if err := templates.Page(siteSettings, post).Render(ctx, buf); err != nil {
+			if err := templates.Page(siteSettings, post).Render(buf); err != nil {
 				return errors.WithStack(err)
 			}
 		}

@@ -227,6 +233,7 @@ return errors.WithStack(err)
 	}
 
 	log.Debug("rendering robots.txt")
+	buf.Reset()
 	rob, err := template.RenderRobotsTXT(config)
 	if err != nil {
 		return errors.WithStack(err)