diff options
| author | Alan Pearce | 2025-03-18 22:40:46 +0100 |
|---|---|---|
| committer | Alan Pearce | 2025-03-19 17:33:58 +0100 |
| commit | 896d844cac976afd0ee8aa73dd2fb28e15e7ac79 (patch) | |
| tree | cc8d288d0039cb3d2084f43cafe8d4e0aea50e8b /internal/server | |
| parent | 1183108baa44fde88944e9207fb7763668c2b448 (diff) | |
| download | searchix-896d844cac976afd0ee8aa73dd2fb28e15e7ac79.tar.lz searchix-896d844cac976afd0ee8aa73dd2fb28e15e7ac79.tar.zst searchix-896d844cac976afd0ee8aa73dd2fb28e15e7ac79.zip | |
feat: Convert templ components to gomponents
Diffstat (limited to 'internal/server')
| -rw-r--r-- | internal/server/error.go | 4 | ||||
| -rw-r--r-- | internal/server/mux.go | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/internal/server/error.go b/internal/server/error.go index c2acf48..b51cfa9 100644 --- a/internal/server/error.go +++ b/internal/server/error.go @@ -29,9 +29,9 @@ func createErrorHandler( w.Header().Del("Vary") w.WriteHeader(code) if r.Header.Get("Fetch") == "true" { - err = components.Error(indexData).Render(r.Context(), w) + err = components.Error(indexData).Render(w) } else { - err = components.ErrorPage(indexData).Render(r.Context(), w) + err = components.ErrorPage(indexData).Render(w) } if err != nil { log.Error( diff --git a/internal/server/mux.go b/internal/server/mux.go index 1507860..2bbff8e 100644 --- a/internal/server/mux.go +++ b/internal/server/mux.go @@ -44,8 +44,6 @@ func applyDevModeOverrides(cfg *config.Config) { } cfg.Web.ContentSecurityPolicy.ScriptSrc = append( cfg.Web.ContentSecurityPolicy.ScriptSrc, - cfg.Web.BaseURL.JoinPath("_templ/reload/script.js").String(), - "http://localhost:7331", "'unsafe-inline'", ) } @@ -174,9 +172,9 @@ func NewMux( var baseErr error if r.Header.Get("Fetch") == "true" { w.Header().Add("Content-Type", "text/html; charset=utf-8") - baseErr = components.Results(tdata).Render(r.Context(), w) + baseErr = components.Results(tdata).Render(w) } else { - baseErr = components.ResultsPage(tdata).Render(r.Context(), w) + baseErr = components.ResultsPage(tdata).Render(w) } if baseErr != nil { log.Error("template error", "template", importerType, "error", baseErr) @@ -192,7 +190,7 @@ func NewMux( Assets: frontend.Assets, }, components.ResultData{}, - ).Render(r.Context(), w) + ).Render(w) if err != nil { errorHandler(w, r, err.Error(), http.StatusInternalServerError) @@ -248,9 +246,9 @@ func NewMux( var baseErr error if r.Header.Get("Fetch") == "true" { w.Header().Add("Content-Type", "text/html; charset=utf-8") - baseErr = components.Detail(*doc).Render(r.Context(), w) + baseErr = components.Detail(*doc).Render(w) } else { - baseErr = components.DetailPage(tdata, *doc).Render(r.Context(), w) + baseErr = components.DetailPage(tdata, *doc).Render(w) } if baseErr != nil { log.Error("template error", "template", importerSingular, "error", baseErr) |