all repos — homestead @ 08487ad57405c6e9e0673bdcf042a13c5639fdc2

Code for my website

move template files

Alan Pearce
commit

08487ad57405c6e9e0673bdcf042a13c5639fdc2

parent

82424b77fba708e4450c1a0cec5b0c7967b13d7b

1 file changed, 10 insertions(+), 9 deletions(-)

changed files
M domain/content/builder/builder.go → domain/content/builder/builder.go
@@ -11,12 +11,13 @@ "time"
 
 	"alin.ovh/homestead/domain/content"
 	"alin.ovh/homestead/domain/content/builder/template"
+	ctemplates "alin.ovh/homestead/domain/content/templates"
 	"alin.ovh/homestead/domain/indieweb/sitemap"
+	"alin.ovh/homestead/domain/web/templates"
 	"alin.ovh/homestead/shared/buffer"
 	"alin.ovh/homestead/shared/config"
 	"alin.ovh/homestead/shared/storage"
 	"alin.ovh/homestead/shared/vcs"
-	"alin.ovh/homestead/templates"
 	"alin.ovh/x/log"
 
 	"github.com/Southclaws/fault"

@@ -100,7 +101,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(buf); err != nil {
+		if err := ctemplates.PostPage(siteSettings, post).Render(buf); err != nil {
 			return fault.Wrap(err, fmsg.With("could not render post"))
 		}
 

@@ -111,7 +112,7 @@ }
 
 	log.Debug("rendering tags list")
 	buf.Reset()
-	if err := templates.TagsPage(siteSettings, templates.TagsPageVars{
+	if err := ctemplates.TagsPage(siteSettings, ctemplates.TagsPageVars{
 		Title: "Tags",
 		Tags:  mapset.Sorted(cc.Tags),
 	}).Render(buf); err != nil {

@@ -132,7 +133,7 @@ }
 		log.Debug("rendering tags page", "tag", tag)
 		url := path.Join("/tags", tag) + "/"
 		buf.Reset()
-		if err := templates.TagPage(siteSettings, templates.TagPageVars{
+		if err := ctemplates.TagPage(siteSettings, ctemplates.TagPageVars{
 			Tag:   tag,
 			Posts: matchingPosts,
 		}).Render(buf); err != nil {

@@ -173,7 +174,7 @@ }
 
 	log.Debug("rendering list page")
 	buf.Reset()
-	if err := templates.ListPage(siteSettings, templates.ListPageVars{
+	if err := ctemplates.ListPage(siteSettings, ctemplates.ListPageVars{
 		Posts: cc.Posts,
 	}).Render(buf); err != nil {
 		return fault.Wrap(err)

@@ -222,7 +223,7 @@ for _, post := range cc.Pages {
 		buf.Reset()
 		log.Debug("rendering page", "source", post.Input, "path", post.URL)
 		if post.URL == "/" {
-			if err := templates.Homepage(siteSettings, templates.HomepageVars{
+			if err := ctemplates.Homepage(siteSettings, ctemplates.HomepageVars{
 				Email: config.PublicEmail,
 				Me:    config.RelMe,
 				Posts: cc.Posts,

@@ -230,7 +231,7 @@ }, post).Render(buf); err != nil {
 				return fault.Wrap(err)
 			}
 		} else {
-			if err := templates.Page(siteSettings, post).Render(buf); err != nil {
+			if err := ctemplates.Page(siteSettings, post).Render(buf); err != nil {
 				return fault.Wrap(err)
 			}
 		}

@@ -280,7 +281,7 @@
 	log.Debug("rendering go packages")
 	for _, p := range config.Go.Packages {
 		buf.Reset()
-		if err := templates.GoPackagePage(siteSettings, &config.Go, p).Render(buf); err != nil {
+		if err := ctemplates.GoPackagePage(siteSettings, &config.Go, p).Render(buf); err != nil {
 			return fault.Wrap(err)
 		}
 		if err := stor.Write(fmt.Sprintf("/go/%s.html", p), siteSettings.Title, buf); err != nil {

@@ -289,7 +290,7 @@ }
 	}
 
 	buf.Reset()
-	if err := templates.GoPackageListPage(siteSettings, &config.Go).Render(buf); err != nil {
+	if err := ctemplates.GoPackageListPage(siteSettings, &config.Go).Render(buf); err != nil {
 		return fault.Wrap(err)
 	}
 	if err := stor.Write("/go/", siteSettings.Title, buf); err != nil {