Rework layouts to get embedded filesystem working again

I really hate go templates at this point.

html/embed.go

@@ -72,21 +72,14 @@ func (ts templateSystemEmbed) loadTemplateSubdir(subdir string) error {
 			return fmt.Errorf("error parsing '%s': %w", path, err)
 		}
 		short_path := removeLeadingDir(path)
-		shared_template_holder := template.New("shared")
 		shared_subdirs := []string{"template/sync/component", "template/sync/layout"}
 		for _, shared_subdir := range shared_subdirs {
-			err := ts.addSubdirTemplates(shared_template_holder, shared_subdir)
+			err := ts.addSubdirTemplates(new_t, shared_subdir)
 			if err != nil {
 				return fmt.Errorf("Failed to add subdir '%s' templates: %w", shared_subdir, err)
 			}
 		}
-		if shared_template_holder.Tree == nil {
-			return fmt.Errorf("shared template holder tree is nil")
-		}
-		_, err = new_t.AddParseTree(short_path, shared_template_holder.Tree)
-		if err != nil {
-			return fmt.Errorf("error adding shared parse tree to '%s': %w", path, err)
-		}
+		ts.nameToTemplate[short_path] = new_t
 		log.Debug().Str("path", short_path).Msg("Loaded page template")
 		return nil
 	})
@@ -95,7 +88,7 @@ func (ts templateSystemEmbed) loadTemplateSubdir(subdir string) error {
 
 func (ts templateSystemEmbed) addSubdirTemplates(t *template.Template, subdir string) error {
 	var err error
-	log.Debug().Msg("Adding subdir templates")
+	//log.Debug().Msg("Adding subdir templates")
 	err = fs.WalkDir(ts.sourceFS, subdir, func(path string, d fs.DirEntry, err error) error {
 		if err != nil || d.IsDir() {
 			return err
@@ -117,8 +110,8 @@ func (ts templateSystemEmbed) addSubdirTemplates(t *template.Template, subdir st
 		if err != nil {
 			return fmt.Errorf("error adding parse tree '%s': %w", path, err)
 		}
-		ts.nameToTemplate[short_path] = new_t
-		//log.Debug().Str("path", short_path).Msg("Loaded shared component template")
+		//ts.nameToTemplate[short_path] = new_t
+		log.Debug().Str("path", short_path).Msg("Loaded shared component template")
 		return nil
 	})
 	return err
@@ -131,7 +124,8 @@ func (ts templateSystemEmbed) renderOrError(w http.ResponseWriter, template_name
 	templ, ok := ts.nameToTemplate[template_name]
 	if !ok {
 		log.Error().Str("template_name", template_name).Msg("Can't find template")
-		RespondError(w, "Failed to render template", nil, http.StatusInternalServerError)
+		RespondError(w, "Failed to find template", nil, http.StatusInternalServerError)
+		return
 	}
 	err := templ.Execute(buf, context)
 	if err != nil {

html/filesystem.go

@@ -36,7 +36,7 @@ type templateSystemDisk struct {
 
 func LoadTemplates() error {
 	_, err := os.Stat("html/template")
-	if err != nil {
+	if err == nil {
 		templates = templateSystemDisk{
 			sourceFS: os.DirFS("./html/template"),
 		}

html/template/rmo/district-list.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Districts{{ end }}
 {{ define "extraheader" }}

html/template/rmo/email-confirm-complete.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/email-confirm.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/email-subscribe-confirm.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/email-subscribe.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/email-unsubscribe-complete.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/email-unsubscribe.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/nuisance.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Report Nuisance{{ end }}
 {{ define "extraheader" }}

html/template/rmo/privacy.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 {{ define "title" }}Privacy Policy{{ end }}
 {{ define "extraheader" }}
 {{ end }}

html/template/rmo/quick-submit-complete.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Quick Report Complete{{ end }}
 {{ define "extraheader" }}

html/template/rmo/quick.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Quick Report{{ end }}
 {{ define "extraheader" }}

html/template/rmo/register-notifications-complete.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Notification Request Complete{{ end }}
 {{ define "extraheader" }}

html/template/rmo/root.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Main{{ end }}
 {{ define "extraheader" }}

html/template/rmo/search.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Status{{ end }}
 {{ define "extraheader" }}

html/template/rmo/status-by-id.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Status of report {{ .Report.ID|publicReportID }}{{ end }}
 {{ define "extraheader" }}

html/template/rmo/status.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Status{{ end }}
 {{ define "extraheader" }}

html/template/rmo/submit-complete.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Report Submission Complete{{ end }}
 {{ define "extraheader" }}

html/template/rmo/terms.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 {{ define "title" }}Privacy Policy{{ end }}
 {{ define "extraheader" }}
 {{ end }}

html/template/rmo/water.html

@@ -1,4 +1,4 @@
-{{ template "rmo/base.html" . }}
+{{ template "rmo/layout/base.html" . }}
 
 {{ define "title" }}Report Standing Water{{ end }}
 {{ define "extraheader" }}

html/template/sync/admin.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/cell.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/dashboard.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/data-entry-bad.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Data Entry{{ end }}
 {{ define "extraheader" }}

html/template/sync/data-entry-good.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Data Entry{{ end }}
 {{ define "extraheader" }}

html/template/sync/data-entry.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Data Entry{{ end }}
 {{ define "extraheader" }}

html/template/sync/dispatch-results.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Data Entry{{ end }}
 {{ define "extraheader" }}

html/template/sync/dispatch.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Data Entry{{ end }}
 {{ define "extraheader" }}

html/template/sync/district.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/empty-auth.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/empty.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/layout-test.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 {{ define "title" }}Layout Test{{ end }}
 {{ define "extraheader" }}
 	<style>

html/template/sync/mock-root.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Data Entry{{ end }}
 {{ define "extraheader" }}

html/template/sync/oauth-prompt.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/privacy.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 {{ define "title" }}Privacy Policy{{ end }}
 {{ define "extraheader" }}
 {{ end }}

html/template/sync/report-confirmation.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/report-contribute.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/report-detail.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/report-evidence.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/report-schedule.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/report-update.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/report.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-detail.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-location.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-mosquito.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-pool.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-quick-confirmation.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-quick.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request-updates.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/service-request.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/setting-integration.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/setting-mock.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/setting-pesticide-add.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/setting-pesticide.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/setting-user-add.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/setting-user.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/settings.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/signin.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/signup.html

@@ -1,4 +1,4 @@
-{{ template "sync/base.html" . }}
+{{ template "sync/layout/base.html" . }}
 
 {{ define "title" }}Login{{ end }}
 {{ define "extraheader" }}

html/template/sync/source.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/text-messages.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}

html/template/sync/trap.html

@@ -1,4 +1,4 @@
-{{ template "sync/authenticated.html" . }}
+{{ template "sync/layout/authenticated.html" . }}
 
 {{ define "title" }}Dash{{ end }}
 {{ define "extraheader" }}