diff --git a/main.go b/main.go index 5b84b2c..a7f248b 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "log" "net/http" "html/template" - //"github.com/gorilla/mux" + "github.com/gorilla/mux" "homnomnom.fr/jdr-server/jdr" ) @@ -19,14 +19,20 @@ func mainPageHandler(w http.ResponseWriter, r *http.Request) { } func playerPageHandler(w http.ResponseWriter, r *http.Request) { - err := templates.ExecuteTemplate(w, "player.html", 1) + sheet, err := jdr.ReadCharacterSheet("jdr-desc/wasteland.xml") + if err != nil { + log.Fatal("error: ", err) + } + + err = templates.ExecuteTemplate(w, "player.html", map[string]interface{}{ + "Sheet": sheet.Render(), + }) if err != nil { log.Println(err) } } func main() { - /* ParseArguments() LoadConfig() @@ -34,12 +40,4 @@ func main() { r.HandleFunc("/", mainPageHandler) r.HandleFunc("/player", playerPageHandler) log.Fatal(http.ListenAndServe(":8080", r)) - */ - - sheet, err := jdr.ReadCharacterSheet("jdr-desc/wasteland.xml") - if err != nil { - log.Fatal("error: ", err) - } - log.Println(sheet.Render()) - //log.Println(sheet.CustomTypes.Enums[0].Name) } diff --git a/templates/player.html b/templates/player.html index c17f73c..f98831a 100644 --- a/templates/player.html +++ b/templates/player.html @@ -4,13 +4,7 @@
- - - - - - - + {{.Sheet}}