From 58ff4e0d178bb51d1515abb3771e0b6645440946 Mon Sep 17 00:00:00 2001
From: Ruidy Nemausat <ruidy.nemausat@gmail.com>
Date: Wed, 18 Mar 2020 11:25:00 +0100
Subject: [PATCH] homeHandler, new page form and  handler

---
 controllers/router.go |  9 +++++++--
 data/db.go            | 13 -------------
 main.go               | 14 ++++++--------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/controllers/router.go b/controllers/router.go
index d55edbf..c3cd517 100644
--- a/controllers/router.go
+++ b/controllers/router.go
@@ -3,11 +3,16 @@ package controllers
 import (
 	"net/http"
 	"regexp"
+
+	"github.com/rjNemo/go-wiki/data"
 )
 
 // Router dispatch the request to the corresponding route handlers.
-func Router(ph PageHandler, hh HomeHandler) {
-	// http.HandleFunc("/", loveHandler)
+func Router(ctx data.Context) {
+	hh := HomeHandler{Ctx: ctx}
+	ph := PageHandler{Ctx: ctx}
+	// uh := UserHandler{Users: UserStore}
+
 	http.HandleFunc("/view/", makeHandler(ph.view))
 	http.HandleFunc("/edit/", makeHandler(ph.edit))
 	http.HandleFunc("/save/", makeHandler(ph.save))
diff --git a/data/db.go b/data/db.go
index 234344a..572bd74 100644
--- a/data/db.go
+++ b/data/db.go
@@ -24,19 +24,6 @@ func NewDB(connection string) (*sql.DB, error) {
 
 	log.Println("Connection to database successfully established!")
 	return db, nil
-
-	// store := NewUserStore(db)
-	// store.CreateTable()
-
-	// u := models.TestUser()
-	// store.Add(u)
-	// log.Print(u)
-	// u1 := models.NewUser(3, 20, "paul", "newman", "PdsNz@FDKML.COM")
-	// store.Update(16, u1)
-	// log.Println(store.Get(1))
-	// store.Delete(8)
-	// log.Println(store.GetAll())
-	// log.Println(store.Find("first_name", "John"))
 }
 
 // Context registers the application data stores
diff --git a/main.go b/main.go
index 96d2cb7..927b157 100644
--- a/main.go
+++ b/main.go
@@ -22,16 +22,14 @@ func main() {
 
 	// Migrate db …
 	ctx.Pages.CreateTable()
-	// ctx.Users.CreateTable()
+	ctx.Users.CreateTable()
 
-	// create handlers around context
-	hh := controllers.HomeHandler{Ctx: ctx}
-	ph := controllers.PageHandler{Ctx: ctx}
-	// uh := controllers.UserHandler{Users: UserStore}
-
-	// startServer
 	log.Printf("Start Go-wiki server on http://localhost:%s", settings.Port)
 	port := ":" + settings.Port
-	controllers.Router(ph, hh)
+
+	// create handlers around context
+	controllers.Router(ctx)
+
+	// startServer
 	log.Fatal(http.ListenAndServe(port, nil))
 }