From e28c169f6f44337370cd96e46b9bd64d8d8fae99 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Wed, 18 Mar 2020 16:59:07 +0100 Subject: [PATCH] added a index page --- controllers/home.go | 11 +++++------ controllers/page.go | 9 ++++++++- controllers/router.go | 1 + views/templates/base.html | 11 ++++++----- views/templates/edit.html | 5 +++++ views/templates/home.html | 32 ++++---------------------------- views/templates/index.html | 31 +++++++++++++++++++++++++++++++ 7 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 views/templates/index.html diff --git a/controllers/home.go b/controllers/home.go index f26902a..a1c027a 100644 --- a/controllers/home.go +++ b/controllers/home.go @@ -5,7 +5,6 @@ import ( "net/http" "github.com/rjNemo/go-wiki/data" - "github.com/rjNemo/go-wiki/models" "github.com/rjNemo/go-wiki/services" "github.com/rjNemo/go-wiki/views" ) @@ -16,11 +15,11 @@ type HomeHandler struct { } func (hh HomeHandler) home(w http.ResponseWriter, r *http.Request) { - index, err := hh.Ctx.Pages.GetAll() - if err != nil { - log.Fatal(err) - } - views.Template(w, "home", struct{ Wikis []models.Page }{index}) + // index, err := hh.Ctx.Pages.GetAll() + // if err != nil { + // log.Fatal(err) + // } + views.Template(w, "home", nil) } func (hh HomeHandler) contact(w http.ResponseWriter, r *http.Request) { diff --git a/controllers/page.go b/controllers/page.go index 0199213..206c1cd 100644 --- a/controllers/page.go +++ b/controllers/page.go @@ -14,7 +14,14 @@ type PageHandler struct { Ctx data.Context } -// func viewHandler(w http.ResponseWriter, r *http.Request, title string) { +func (ph PageHandler) index(w http.ResponseWriter, r *http.Request) { + index, err := ph.Ctx.Pages.GetAll() + if err != nil { + log.Fatal(err) + } + views.Template(w, "index", struct{ Wikis []models.Page }{index}) +} + func (ph PageHandler) view(w http.ResponseWriter, r *http.Request, title string) { // p, err := models.LoadPage(title) p, err := ph.Ctx.Pages.Get(title) diff --git a/controllers/router.go b/controllers/router.go index c3cd517..d8ae6ef 100644 --- a/controllers/router.go +++ b/controllers/router.go @@ -13,6 +13,7 @@ func Router(ctx data.Context) { ph := PageHandler{Ctx: ctx} // uh := UserHandler{Users: UserStore} + http.HandleFunc("/index/", ph.index) http.HandleFunc("/view/", makeHandler(ph.view)) http.HandleFunc("/edit/", makeHandler(ph.edit)) http.HandleFunc("/save/", makeHandler(ph.save)) diff --git a/views/templates/base.html b/views/templates/base.html index c3a83ee..ad4dc9f 100644 --- a/views/templates/base.html +++ b/views/templates/base.html @@ -17,7 +17,7 @@