diff --git a/models.go b/models.go index b6d8078..2de869b 100644 --- a/models.go +++ b/models.go @@ -55,3 +55,9 @@ func (u *URL) SetName(name string) error { u.UpdatedAt = time.Now() return db.Save(&u) } + +func (u *URL) update(target string) error { + u.URL = target + u.UpdatedAt = time.Now() + return db.Update(u) +} diff --git a/server.go b/server.go index 9421dbb..58bf35c 100644 --- a/server.go +++ b/server.go @@ -215,6 +215,75 @@ func (s *Server) StatsHandler() httprouter.Handle { } } +// EditHandler ... +func (s *Server) EditHandler() httprouter.Handle { + return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) { + var u URL + + id := p.ByName("id") + if id == "" { + http.Error(w, "Bad Request", http.StatusBadRequest) + return + } + + err := db.One("ID", id, &u) + if err != nil && err == storm.ErrNotFound { + http.Error(w, "Not Found", http.StatusNotFound) + return + } else if err != nil { + log.Printf("error looking up %s for editing: %s", id, err) + http.Error(w, "Iternal Error", http.StatusInternalServerError) + return + } + + s.render( + "edit", w, + struct { + ID string + URL string + }{ + ID: u.ID, + URL: u.URL, + }, + ) + } +} + +// UpdateHandler ... +func (s *Server) UpdateHandler() httprouter.Handle { + return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) { + var u URL + + id := p.ByName("id") + target := r.FormValue("url") + if id == "" || target == "" { + http.Error(w, "Bad Request", http.StatusBadRequest) + return + } + + err := db.One("ID", id, &u) + if err != nil && err == storm.ErrNotFound { + http.Error(w, "Not Found", http.StatusNotFound) + return + } else if err != nil { + log.Printf("error looking up %s for editing: %v", id, err) + http.Error(w, "Iternal Error", http.StatusInternalServerError) + return + } + + err = u.update(target) + if err != nil { + log.Printf("error updating %s error: %v", id, err) + http.Error(w, "Internal Error", http.StatusInternalServerError) + return + } + + redirectURL := fmt.Sprintf("/u/%s", u.ID) + + http.Redirect(w, r, redirectURL, http.StatusFound) + } +} + // ListenAndServe ... func (s *Server) ListenAndServe() { log.Fatal( @@ -245,6 +314,8 @@ func (s *Server) initRoutes() { s.router.POST("/", s.ShortenHandler()) s.router.GET("/u/:id", s.ViewHandler()) s.router.GET("/r/:id", s.RedirectHandler()) + s.router.GET("/e/:id", s.EditHandler()) + s.router.POST("/e/:id", s.UpdateHandler()) } // NewServer ... @@ -278,8 +349,13 @@ func NewServer(bind string, config Config) *Server { template.Must(viewTemplate.Parse(box.MustString("view.html"))) template.Must(viewTemplate.Parse(box.MustString("base.html"))) + editTemplate := template.New("edit") + template.Must(editTemplate.Parse(box.MustString("edit.html"))) + template.Must(editTemplate.Parse(box.MustString("base.html"))) + server.templates.Add("index", indexTemplate) server.templates.Add("view", viewTemplate) + server.templates.Add("edit", editTemplate) server.initRoutes() diff --git a/templates/base.html b/templates/base.html index a6779ce..8beeddd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,6 +4,7 @@ + {{ template "stylesheets" . }} {{ template "css" . }} diff --git a/templates/edit.html b/templates/edit.html new file mode 100644 index 0000000..10d51db --- /dev/null +++ b/templates/edit.html @@ -0,0 +1,19 @@ +{{define "content"}} +
+
+
+

Your short url is: {{.ID}}

+
+
+ + + + + View + +
+
+
+
+
+{{end}} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index bbed862..9446c45 100644 --- a/templates/index.html +++ b/templates/index.html @@ -7,7 +7,7 @@ {{ $URL.ID }} - {{ $URL.URL }} + {{ $URL.URL -}} View @@ -23,7 +23,7 @@
- +
diff --git a/templates/view.html b/templates/view.html index b05a5d3..392e3f8 100644 --- a/templates/view.html +++ b/templates/view.html @@ -6,6 +6,9 @@
+ + Edit +