diff --git a/pkg/webui/root_controller.go b/pkg/webui/root_controller.go index 4f2d672..f3b7eb3 100644 --- a/pkg/webui/root_controller.go +++ b/pkg/webui/root_controller.go @@ -21,55 +21,7 @@ func RootGreeting(w http.ResponseWriter, req *http.Request, ctx *web.Context) (e return err } -// RootMonitor serves the Inbucket monitor page -func RootMonitor(w http.ResponseWriter, req *http.Request, ctx *web.Context) (err error) { - if !ctx.RootConfig.Web.MonitorVisible { - ctx.Session.AddFlash("Monitor is disabled in configuration", "errors") - _ = ctx.Session.Save(req, w) - http.Redirect(w, req, web.Reverse("RootIndex"), http.StatusSeeOther) - return nil - } - // Get flash messages, save session - errorFlash := ctx.Session.Flashes("errors") - if err = ctx.Session.Save(req, w); err != nil { - return err - } - // Render template - return web.RenderTemplate("root/monitor.html", w, map[string]interface{}{ - "ctx": ctx, - "errorFlash": errorFlash, - }) -} - -// RootMonitorMailbox serves the Inbucket monitor page for a particular mailbox -func RootMonitorMailbox(w http.ResponseWriter, req *http.Request, ctx *web.Context) (err error) { - if !ctx.RootConfig.Web.MonitorVisible { - ctx.Session.AddFlash("Monitor is disabled in configuration", "errors") - _ = ctx.Session.Save(req, w) - http.Redirect(w, req, web.Reverse("RootIndex"), http.StatusSeeOther) - return nil - } - name, err := ctx.Manager.MailboxForAddress(ctx.Vars["name"]) - if err != nil { - ctx.Session.AddFlash(err.Error(), "errors") - _ = ctx.Session.Save(req, w) - http.Redirect(w, req, web.Reverse("RootIndex"), http.StatusSeeOther) - return nil - } - // Get flash messages, save session - errorFlash := ctx.Session.Flashes("errors") - if err = ctx.Session.Save(req, w); err != nil { - return err - } - // Render template - return web.RenderTemplate("root/monitor.html", w, map[string]interface{}{ - "ctx": ctx, - "errorFlash": errorFlash, - "name": name, - }) -} - -// RootStatus serves the Inbucket status page +// RootStatus renders portions of the server configuration as JSON. func RootStatus(w http.ResponseWriter, req *http.Request, ctx *web.Context) (err error) { root := ctx.RootConfig retPeriod := "" diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go index a480f7b..7673f9e 100644 --- a/pkg/webui/routes.go +++ b/pkg/webui/routes.go @@ -10,16 +10,12 @@ import ( func SetupRoutes(r *mux.Router) { r.Path("/greeting").Handler( web.Handler(RootGreeting)).Name("RootGreeting").Methods("GET") - r.Path("/monitor").Handler( - web.Handler(RootMonitor)).Name("RootMonitor").Methods("GET") - r.Path("/monitor/{name}").Handler( - web.Handler(RootMonitorMailbox)).Name("RootMonitorMailbox").Methods("GET") r.Path("/status").Handler( web.Handler(RootStatus)).Name("RootStatus").Methods("GET") r.Path("/m/{name}/{id}").Handler( web.Handler(MailboxMessage)).Name("MailboxMessage").Methods("GET") r.Path("/m/{name}/{id}/html").Handler( - web.Handler(MailboxHTML)).Name("MailboxHtml").Methods("GET") + web.Handler(MailboxHTML)).Name("MailboxHTML").Methods("GET") r.Path("/m/{name}/{id}/source").Handler( web.Handler(MailboxSource)).Name("MailboxSource").Methods("GET") r.Path("/m/attach/{name}/{id}/{num}/{file}").Handler(