feat: use embededfs

lib/blog.go

@@ -2,10 +2,11 @@ package lib
 
 import (
 	"bytes"
+	"embed"
 	"fmt"
 	"html/template"
+	"io/fs"
 	"log"
-	"os"
 	"sort"
 	"strings"
 	"time"
@@ -17,17 +18,20 @@ import (
 	"github.com/yuin/goldmark/renderer/html"
 )
 
+//go:embed content/*
+var content embed.FS
+
 func GetBlogPosts() Posts {
 	var posts Posts
 
-	files, err := os.ReadDir(GetPath("/content/"))
+	files, err := fs.ReadDir(content, "content")
 	if err != nil {
 		log.Fatalf("failed to open file: %v", err)
 	}
 
 	for _, file := range files {
 		if strings.HasSuffix(file.Name(), ".md") {
-			content, err := os.ReadFile(GetPath("/content/") + file.Name())
+			content, err := fs.ReadFile(content, "content/"+file.Name())
 			if err != nil {
 				log.Fatal(err)
 			}

lib/settings.go

@@ -6,15 +6,6 @@ import (
 	_ "github.com/joho/godotenv/autoload"
 )
 
-// Default settings
-var (
-	RootDir string = "."
-)
-
-func GetPath(path string) string {
-	return RootDir + path
-}
-
 func GetServePath(path string) string {
 	return os.Getenv("SERVE_DIR") + path
 }

main.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	"embed"
 	"fmt"
+	"io/fs"
 	"net/http"
 	"strings"
 
@@ -30,6 +32,9 @@ func customHTTPErrorHandler(err error, c echo.Context) {
 	}
 }
 
+//go:embed public/*
+var PubFS embed.FS
+
 func main() {
 	e := echo.New()
 
@@ -75,7 +80,12 @@ func main() {
 		return c.JSON(http.StatusOK, json)
 	})
 
-	e.Static("/*", lib.GetPath("/public"))
+	strippedFS, err := fs.Sub(PubFS, "public")
+	if err != nil {
+		panic(err)
+	}
+	fs := http.FS(strippedFS)
+	e.GET("/*", echo.WrapHandler(http.FileServer(fs)))
 
 	e.Logger.Fatal(e.Start(":3000"))
 }

nix/default.nix

@@ -10,12 +10,11 @@ buildGoModule {
         ../go.mod
         ../go.sum
         ../main.go
-        ../lib
-        ../content
         ../api
+        ../lib
+        ../pages
         ../public
         ../templates
-        ../pages
       ]
     );
   };
@@ -27,21 +26,6 @@ buildGoModule {
     "-w"
   ];
 
-  # we change the rootdir so that the templates and other files are loaded from the right place
-  # TODO: we should change this so that it uses an emebeded filesystem at some point
-  preBuild = ''
-    substituteInPlace lib/settings.go \
-      --replace-fail 'RootDir string = "."' 'RootDir  string = "'$out/share'"'
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share
-
-    cp -r content $out/share/content
-    cp -r public $out/share/public
-    cp -r templates $out/share/templates
-  '';
-
   meta = {
     description = "isabelroses.com";
     homepage = "https://isabelroses.com";

pages/blog.go

@@ -4,6 +4,7 @@ import (
 	"github.com/labstack/echo/v4"
 
 	"isabelroses.com/lib"
+	"isabelroses.com/templates"
 )
 
 type BlogProps struct {
@@ -29,5 +30,5 @@ func Blog(c echo.Context) error {
 	}
 
 	components := []string{"header", "blogpreview"}
-	return lib.RenderTemplate(c.Response().Writer, "base", components, props)
+	return templates.RenderTemplate(c.Response().Writer, "base", components, props)
 }

pages/donos.go

@@ -4,7 +4,9 @@ import (
 	"strings"
 
 	"github.com/labstack/echo/v4"
+
 	"isabelroses.com/lib"
+	"isabelroses.com/templates"
 )
 
 type DonoProps struct {
@@ -28,7 +30,7 @@ func Donos(c echo.Context) error {
 	}
 
 	components := []string{"header", "usercard"}
-	return lib.RenderTemplate(c.Response().Writer, "base", components, props)
+	return templates.RenderTemplate(c.Response().Writer, "base", components, props)
 }
 
 func handleAvatar(dono lib.Donor) lib.Donor {

pages/error.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	"isabelroses.com/lib"
+	"isabelroses.com/templates"
 )
 
 type ErrorProps struct {
@@ -19,6 +19,5 @@ func ErrorPage(c echo.Context, code int) error {
 
 	c.Response().WriteHeader(code)
 	components := []string{"header"}
-	return lib.RenderTemplate(c.Response().Writer, "base", components, props)
-
+	return templates.RenderTemplate(c.Response().Writer, "base", components, props)
 }

pages/home.go

@@ -3,10 +3,10 @@ package pages
 import (
 	"github.com/labstack/echo/v4"
 
-	"isabelroses.com/lib"
+	"isabelroses.com/templates"
 )
 
 func Home(c echo.Context) error {
 	components := []string{"header"}
-	return lib.RenderTemplate(c.Response().Writer, "base", components, nil)
+	return templates.RenderTemplate(c.Response().Writer, "base", components, nil)
 }

pages/post.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"isabelroses.com/lib"
+	"isabelroses.com/templates"
 )
 
 func Post(c echo.Context) error {
@@ -45,5 +46,5 @@ func Post(c echo.Context) error {
 	}
 
 	components := []string{"header"}
-	return lib.RenderTemplate(c.Response().Writer, "base", components, props)
+	return templates.RenderTemplate(c.Response().Writer, "base", components, props)
 }

pages/projects.go

@@ -3,6 +3,7 @@ package pages
 import (
 	"github.com/labstack/echo/v4"
 	"isabelroses.com/lib"
+	"isabelroses.com/templates"
 )
 
 type ProjectProps struct {
@@ -54,5 +55,5 @@ func Projects(c echo.Context) error {
 	}
 
 	components := []string{"header", "project"}
-	return lib.RenderTemplate(c.Response().Writer, "base", components, props)
+	return templates.RenderTemplate(c.Response().Writer, "base", components, props)
 }

templates/main.go

@@ -0,0 +1,55 @@
+package templates
+
+import (
+	"embed"
+	"html/template"
+	"io/fs"
+	"log"
+	"net/http"
+	"path/filepath"
+	"runtime"
+)
+
+//go:embed layouts/* pages/* components/*
+var templatesFS embed.FS
+
+// RenderTemplate renders a template with the given layout, components, and properties.
+func RenderTemplate(w http.ResponseWriter, layout string, components []string, props interface{}) error {
+	_, filename, _, _ := runtime.Caller(1)
+	page := filepath.Base(filename)
+	page = page[:len(page)-len(filepath.Ext(page))]
+
+	// Collect the template paths
+	templatePaths := []string{
+		"layouts/" + layout + ".tmpl",
+		"pages/" + page + ".tmpl",
+	}
+
+	for _, component := range components {
+		templatePaths = append(templatePaths, "components/"+component+".tmpl")
+	}
+
+	// Create a new template and parse the files from the embedded file system
+	ts := template.New("")
+	for _, path := range templatePaths {
+		content, err := fs.ReadFile(templatesFS, path)
+		if err != nil {
+			log.Print(err.Error())
+			return err
+		}
+		ts, err = ts.Parse(string(content))
+		if err != nil {
+			log.Print(err.Error())
+			return err
+		}
+	}
+
+	// Execute the template
+	err := ts.ExecuteTemplate(w, layout, props)
+	if err != nil {
+		log.Print(err.Error())
+		return err
+	}
+
+	return nil
+}