From 5a062eb437cc7020613eeff924e4b4c18f5f2461 Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Fri, 9 Nov 2018 21:14:22 -0500 Subject: [PATCH] Include flashes on signup page --- app.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app.go b/app.go index 270b731..8182f54 100644 --- a/app.go +++ b/app.go @@ -5,6 +5,7 @@ import ( "flag" "fmt" _ "github.com/go-sql-driver/mysql" + "html/template" "net/http" "os" "os/signal" @@ -64,8 +65,26 @@ func handleViewHome(app *app, w http.ResponseWriter, r *http.Request) error { return handleViewPad(app, w, r) } + p := struct { + page.StaticPage + Flashes []template.HTML + }{ + StaticPage: pageForReq(app, r), + } + + // Get error messages + session, err := app.sessionStore.Get(r, cookieName) + if err != nil { + // Ignore this + log.Error("Unable to get session in handleViewHome; ignoring: %v", err) + } + flashes, _ := getSessionFlashes(app, w, r, session) + for _, flash := range flashes { + p.Flashes = append(p.Flashes, template.HTML(flash)) + } + // Show landing page - return renderPage(w, "landing.tmpl", pageForReq(app, r)) + return renderPage(w, "landing.tmpl", p) } func pageForReq(app *app, r *http.Request) page.StaticPage {