From f2d5b5e8c554ed84aaf4d86ea06d97682263933c Mon Sep 17 00:00:00 2001
From: "Alexander \"Arav\" Andreev" <me@arav.top>
Date: Tue, 24 May 2022 19:42:47 +0400
Subject: [PATCH] Template is being embed directly and all code for directory
 was removed.

---
 web/web.go | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/web/web.go b/web/web.go
index a2ff05e..afb3d81 100644
--- a/web/web.go
+++ b/web/web.go
@@ -4,43 +4,36 @@ import (
 	"dwelling-radio/pkg/logging"
 	"embed"
 	"html/template"
+	"io/fs"
 	"net/http"
 
 	"github.com/Joker/jade"
 )
 
-var compiledTemplates map[string]*template.Template
-
 //go:embed assets
 var assetsDir embed.FS
 
 func Assets() http.FileSystem {
-	return http.FS(assetsDir)
+	f, _ := fs.Sub(assetsDir, "assets")
+	return http.FS(f)
 }
 
 func AssetsGetFile(path string) ([]byte, error) {
-	return assetsDir.ReadFile(path)
+	return assetsDir.ReadFile("assets/" + path)
 }
 
-//go:embed templates
-var templatesDir embed.FS
-
-func Template(name string) *template.Template {
-	return compiledTemplates[name]
-}
+//go:embed templates/index.jade
+var indexJadeTpl []byte
+var IndexTemplate *template.Template
 
 func CompileTemplates(lErr *logging.Logger) {
-	compiledTemplates = make(map[string]*template.Template)
-
-	indexStr, err := jade.ParseFileFromFileSystem("index.jade", http.FS(templatesDir))
+	indexParsedTpl, err := jade.Parse("index", indexJadeTpl)
 	if err != nil {
 		lErr.Fatalln(err)
 	}
 
-	indexTpl, err := template.New("index").Parse(indexStr)
+	IndexTemplate, err = template.New("index").Parse(indexParsedTpl)
 	if err != nil {
 		lErr.Fatalln(err)
 	}
-
-	compiledTemplates["index"] = indexTpl
 }