From 771ef706d7c70f583dad956077eaf79fc4fdc093 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 7 May 2024 18:54:45 +0200
Subject: style: split homepage and search page

---
 internal/server/server.go    | 11 ++++++++++-
 internal/server/templates.go | 24 ++++++++++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'internal/server')

diff --git a/internal/server/server.go b/internal/server/server.go
index 3f87b9d..c0fbfd0 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -57,6 +57,7 @@ const jsSnippet = template.HTML(livereload.JsSnippet) // #nosec G203
 type TemplateData struct {
 	LiveReload template.HTML
 	Query      string
+	Results    bool
 }
 
 type ResultData[T options.NixOption] struct {
@@ -120,6 +121,14 @@ func New(runtimeConfig *Config) (*Server, error) {
 		}
 	})
 
+	mux.HandleFunc("/search/{source}", func(w http.ResponseWriter, r *http.Request) {
+		log.Println(r.PathValue("source"))
+		err := templates["search"].Execute(w, indexData)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
+	})
+
 	timeout := 1 * time.Second
 	mux.HandleFunc("/options/results", func(w http.ResponseWriter, r *http.Request) {
 		ctx, cancel := context.WithTimeoutCause(r.Context(), timeout, errors.New("timeout"))
@@ -141,7 +150,7 @@ func New(runtimeConfig *Config) (*Server, error) {
 		}
 		if r.Header.Get("Fetch") == "true" {
 			w.Header().Add("Content-Type", "text/html; charset=utf-8")
-			err = templates["options"].Execute(w, tdata)
+			err = templates["options"].ExecuteTemplate(w, "options.gotmpl", tdata)
 		} else {
 			err = templates["options"].ExecuteTemplate(w, "index.gotmpl", tdata)
 		}
diff --git a/internal/server/templates.go b/internal/server/templates.go
index 71fc5c7..8755e36 100644
--- a/internal/server/templates.go
+++ b/internal/server/templates.go
@@ -34,14 +34,20 @@ var templateFuncs = template.FuncMap{
 	},
 }
 
-func loadTemplate(filenames ...string) (*template.Template, error) {
-	tpl := template.New(path.Base(filenames[0]))
+func loadTemplate(layoutFile string, filename string) (*template.Template, error) {
+	tpl := template.New("index.gotmpl")
 
 	tpl.Funcs(templateFuncs)
-
-	_, err := tpl.ParseFiles(filenames...)
+	_, err := tpl.ParseFiles(layoutFile)
 	if err != nil {
-		return nil, errors.WithMessage(err, "could not parse template")
+		return nil, errors.WithMessage(err, "could not parse layout template")
+	}
+
+	if filename != "" {
+		_, err = tpl.ParseGlob(filename)
+		if err != nil {
+			return nil, errors.WithMessage(err, "could not parse template")
+		}
 	}
 
 	return tpl, nil
@@ -53,21 +59,23 @@ func loadTemplates() (TemplateCollection, error) {
 
 	layoutFile := path.Join(templateDir, "index.gotmpl")
 
-	index, err := loadTemplate(layoutFile)
+	index, err := loadTemplate(layoutFile, "")
 	if err != nil {
 		return nil, err
 	}
 	templates["index"] = index
 
-	templatePaths, err := filepath.Glob(path.Join(templateDir, "blocks", "*.gotmpl"))
+	glob := path.Join(templateDir, "blocks", "*.gotmpl")
+	templatePaths, err := filepath.Glob(glob)
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not glob block templates")
 	}
 	for _, fullname := range templatePaths {
-		tpl, err := loadTemplate(fullname, layoutFile)
+		tpl, err := loadTemplate(layoutFile, glob)
 		if err != nil {
 			return nil, err
 		}
+
 		name, _ := strings.CutSuffix(path.Base(fullname), ".gotmpl")
 		templates[name] = tpl
 	}
-- 
cgit 1.4.1