Go Embed!

lib/markdown.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"os"
+	"io/fs"
 	"strings"
 
 	"github.com/yuin/goldmark"
@@ -18,8 +18,8 @@ type FrontMatter struct {
 	Tags []string
 }
 
-func ExtractFrontMatter(file os.DirEntry, dir string) (CardLink, error) {
-	f, err := os.Open(dir + file.Name())
+func ExtractFrontMatter(file fs.DirEntry, contentFS fs.FS) (CardLink, error) {
+	f, err := contentFS.Open(file.Name())
 	if err != nil {
 		return CardLink{}, fmt.Errorf("failed to open file: %w", err)
 	}

lib/templates.go

@@ -6,6 +6,10 @@ import (
 	"net/http"
 	"path/filepath"
 	"runtime"
+
+	templatefs "goth.stack/pages/templates"
+
+	
 )
 
 func RenderTemplate(w http.ResponseWriter, layout string, partials []string, props interface{}) error {
@@ -16,15 +20,15 @@ func RenderTemplate(w http.ResponseWriter, layout string, partials []string, pro
 
 	// Build the list of templates
 	templates := []string{
-		"./pages/templates/layouts/" + layout + ".html",
-		"./pages/templates/" + page + ".html",
+		"layouts/" + layout + ".html",
+		page + ".html",
 	}
 	for _, partial := range partials {
-		templates = append(templates, "./pages/templates/partials/"+partial+".html")
+		templates = append(templates, "partials/"+partial+".html")
 	}
 
 	// Parse the templates
-	ts, err := template.ParseFiles(templates...)
+	ts, err := template.ParseFS(templatefs.FS, templates...)
 	if err != nil {
 		log.Print(err.Error())
 		return err