diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/handlers/main.go | 20 | ||||
| -rw-r--r-- | internal/models/models.go | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/internal/handlers/main.go b/internal/handlers/main.go index 1934250..4abc8e1 100644 --- a/internal/handlers/main.go +++ b/internal/handlers/main.go @@ -43,9 +43,14 @@ func (h *Handlers) Ping(w http.ResponseWriter, r *http.Request) { func (h *Handlers) MainPage(w http.ResponseWriter, r *http.Request) { h.log.Info("got mainpage request") - tmpl := template.Must(template. - ParseFiles("components/index.html")) - tmpl.Execute(w, us) + // tmpl := template.Must(template.ParseFiles("components/index.html")) + tmpl, err := template.ParseGlob("components/*.html") + if err != nil { + panic(err) + } + // tmpl.Execute(w, us) + us.ID = "test" + tmpl.ExecuteTemplate(w, "main", us) } func (h *Handlers) HandleForm(w http.ResponseWriter, r *http.Request) { @@ -53,7 +58,7 @@ func (h *Handlers) HandleForm(w http.ResponseWriter, r *http.Request) { h.log.Info("got postform request", "payload", r.PostForm) magnitude := uint8(1) mS := r.PostFormValue("magnitude") - if mS != "1" || mS != "" { + if mS != "1" || mS != "" || mS != " " { u64, err := strconv.ParseUint(mS, 10, 64) magnitude = uint8(u64) if err != nil { @@ -83,7 +88,8 @@ func (h *Handlers) HandleForm(w http.ResponseWriter, r *http.Request) { Repeatable: repeat, } us.Actions = append(us.Actions, act) - tmpl := template.Must(template. - ParseFiles("components/index.html")) - tmpl.Execute(w, us) + tmpl := template.Must(template.ParseGlob("components/*.html")) + // tmpl := template.Must(template.ParseFiles("components/index.html")) + // tmpl.Execute(w, us) + tmpl.ExecuteTemplate(w, "main", us) } diff --git a/internal/models/models.go b/internal/models/models.go index ee6ae5f..42990a3 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -16,8 +16,6 @@ type ( BurnTime time.Time Score int8 } - - // plus 1 Action struct { Name string Magnitude uint8 |