diff --git a/snippetbox/cmd/web/handlers.go b/snippetbox/cmd/web/handlers.go index bac7b33..94dcf53 100644 --- a/snippetbox/cmd/web/handlers.go +++ b/snippetbox/cmd/web/handlers.go @@ -23,26 +23,26 @@ func (app *application) home(w http.ResponseWriter, r *http.Request) { return } - for _, snippet := range snippets { - fmt.Fprintf(w, "%+v", snippet) + files := []string{ + "./ui/html/base.tmpl", + "./ui/html/partials/nav.tmpl", + "./ui/html/pages/home.tmpl", } - // files := []string{ - // "./ui/html/base.tmpl", - // "./ui/html/partials/nav.tmpl", - // "./ui/html/pages/home.tmpl", - // } + ts, err := template.ParseFiles(files...) + if err != nil { + app.serverError(w, r, err) + return + } - // ts, err := template.ParseFiles(files...) - // if err != nil { - // app.serverError(w, r, err) - // return - // } + data := templateData{ + Snippets: snippets, + } - // err = ts.ExecuteTemplate(w, "base", nil) - // if err != nil { - // app.serverError(w, r, err) - // } + err = ts.ExecuteTemplate(w, "base", data) + if err != nil { + app.serverError(w, r, err) + } } // snippetView ... diff --git a/snippetbox/cmd/web/templates.go b/snippetbox/cmd/web/templates.go index fa0f998..61e5975 100644 --- a/snippetbox/cmd/web/templates.go +++ b/snippetbox/cmd/web/templates.go @@ -6,4 +6,5 @@ import ( type templateData struct { Snippet models.Snippet + Snippets []models.Snippet } diff --git a/snippetbox/ui/html/pages/home.tmpl b/snippetbox/ui/html/pages/home.tmpl index 534188a..53dc621 100644 --- a/snippetbox/ui/html/pages/home.tmpl +++ b/snippetbox/ui/html/pages/home.tmpl @@ -2,5 +2,22 @@ {{define "main"}}
leave me alone!
+ {{if .Snippets}} +Title | +Created | +ID | +
---|---|---|
{{.Title}} | +{{.Created}} | +{{.ID}} | +
{{.Snippet.Content}}
+ {{.Content}}