diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 0ceb6da5..c41e1049 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -248,3 +248,11 @@ func (p *Pages) Static() http.Handler { } return http.StripPrefix("/static/", http.FileServer(http.FS(sub))) } + +func (p *Pages) Error500(w io.Writer) error { + return p.execute("errors/500", w, nil) +} + +func (p *Pages) Error404(w io.Writer) error { + return p.execute("errors/404", w, nil) +} diff --git a/appview/pages/templates/errors/404.html b/appview/pages/templates/errors/404.html index 285c2d6f..4ec3c7f5 100644 --- a/appview/pages/templates/errors/404.html +++ b/appview/pages/templates/errors/404.html @@ -1,10 +1,5 @@ - - 404 - {{ template "layouts/head" . }} - - {{ template "layouts/nav" . }} -
-

404 — nothing like that here.

-
- - +{{ define "title" }}404 · tangled{{ end }} + +{{ define "content" }} +

404 — nothing like that here!

+{{ end }} diff --git a/appview/pages/templates/errors/500.html b/appview/pages/templates/errors/500.html index 642f821c..be763975 100644 --- a/appview/pages/templates/errors/500.html +++ b/appview/pages/templates/errors/500.html @@ -1,10 +1,5 @@ - - 500 - {{ template "layouts/head" . }} - - {{ template "layouts/nav" . }} -
-

500 — something broke!

-
- - +{{ define "title" }}500 · tangled{{ end }} + +{{ define "content" }} +

500 — something broke!

+{{ end }} diff --git a/appview/state/state.go b/appview/state/state.go index 7cd6817b..6d2d122b 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -612,6 +612,10 @@ func (s *State) UserRouter() http.Handler { }) }) + r.NotFound(func(w http.ResponseWriter, r *http.Request) { + s.pages.Error404(w) + }) + return r } @@ -660,5 +664,8 @@ func (s *State) StandardRouter() http.Handler { r.Get("/keys/{user}", s.Keys) + r.NotFound(func(w http.ResponseWriter, r *http.Request) { + s.pages.Error404(w) + }) return r }