embed static files and templates for CLI to server web interface fix #65

Author: dstpierre

render.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"html/template"
 	"net/http"
-	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -19,33 +18,33 @@ var (
 
 func loadTemplates() error {
 	var partials []string
-	entries, err := os.ReadDir("./templates/partials")
+	entries, err := content.ReadDir("templates/partials")
 	if err != nil {
 		return err
 	}
 
 	funcs := customFuncs()
 
 	for _, e := range entries {
-		partials = append(partials, fmt.Sprintf("./templates/partials/%s", e.Name()))
+		partials = append(partials, fmt.Sprintf("templates/partials/%s", e.Name()))
 	}
 
 	views = make(map[string]*template.Template)
 
-	tmpls, err := os.ReadDir("./templates")
+	tmpls, err := content.ReadDir("templates")
 	if err != nil {
 		return err
 	}
 
 	for _, tmpl := range tmpls {
-		name := fmt.Sprintf("./templates/%s", tmpl.Name())
+		name := fmt.Sprintf("templates/%s", tmpl.Name())
 		if !strings.HasSuffix(name, ".html") {
 			continue
 		}
 
 		cur := append([]string{name}, partials...)
 
-		t, err := template.New(tmpl.Name()).Funcs(funcs).ParseFiles(cur...)
+		t, err := template.New(tmpl.Name()).Funcs(funcs).ParseFS(content, cur...)
 		if err != nil {
 			return err
 		}

server.go

@@ -2,6 +2,7 @@ package staticbackend
 
 import (
 	"context"
+	"embed"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -30,6 +31,9 @@ const (
 	AppEnvProd = "prod"
 )
 
+//go:embed static templates
+var content embed.FS
+
 // Start starts the web server and all dependencies services
 func Start(c config.AppConfig, log *logger.Logger) {
 	log.Info().Str("Addr", c.AppURL).Msg("server started")
@@ -121,6 +125,9 @@ func Start(c config.AppConfig, log *logger.Logger) {
 		middleware.RequireRoot(backend.DB, backend.Cache),
 	}
 
+	// static assets
+	http.Handle("/static/", http.StripPrefix("/", http.FileServer(http.FS(content))))
+
 	m := &membership{log: log}
 
 	http.Handle("/login/magic", middleware.Chain(http.HandlerFunc(m.magicLink), pubWithDB...))