diff --git a/internal/notes/notes.go b/internal/notes/notes.go index c75216a..d5512de 100644 --- a/internal/notes/notes.go +++ b/internal/notes/notes.go @@ -58,8 +58,3 @@ func LoadNote(title string) (*Note, error) { } return &Note{Title: title, Body: body}, nil } - -func DeleteNote(title string) error { - filename := filepath.Join(conf.Conf.NotesDir, fmtPath(title)) - return os.Remove(filename) -} diff --git a/internal/notes/views/views.go b/internal/notes/views/views.go index adcc693..de23b90 100644 --- a/internal/notes/views/views.go +++ b/internal/notes/views/views.go @@ -19,11 +19,10 @@ func GetRoutes(prefix string) *http.ServeMux { myurls = urls.URLs{ Prefix: prefix, URLs: map[string]urls.URL{ - "view": {Path: "/{note}/", Protocol: "GET", Handler: view}, - "delete": {Path: "/{note}/delete/", Protocol: "GET", Handler: delete}, - "edit": {Path: "/{note}/edit/", Protocol: "GET", Handler: edit}, - "save": {Path: "/{note}/edit/save/", Protocol: "POST", Handler: save}, - "list": {Path: "/", Protocol: "GET", Handler: list}, + "view": {Path: "/{note}/", Protocol: "GET", Handler: view}, + "edit": {Path: "/{note}/edit/", Protocol: "GET", Handler: edit}, + "save": {Path: "/{note}/edit/save/", Protocol: "POST", Handler: save}, + "list": {Path: "/", Protocol: "GET", Handler: list}, }, } return myurls.GetRouter() @@ -33,13 +32,12 @@ func view(w http.ResponseWriter, r *http.Request) { title := r.PathValue("note") note, err := notes.LoadNote(title) urlEdit := myurls.Reverse("edit", urls.Repl{"note": title}) - urlDelete := myurls.Reverse("delete", urls.Repl{"note": title}) if err != nil { http.Redirect(w, r, urlEdit, http.StatusFound) return } - context := templ.Ctx{"note": note, "urlEdit": urlEdit, "urlDelete": urlDelete} + context := templ.Ctx{"note": note, "urlEdit": urlEdit} note.Render() err = templ.RenderTemplate(w, "view.tmpl.html", context) if err != nil { @@ -66,31 +64,11 @@ func edit(w http.ResponseWriter, r *http.Request) { } } -func delete(w http.ResponseWriter, r *http.Request) { - title := r.PathValue("note") - err := notes.DeleteNote(title) - if err != nil { - log.Print(err.Error()) - http.Error(w, "Couldn't delete note", http.StatusInternalServerError) - return - } - - urlDelete := myurls.Reverse("list", urls.Repl{}) - http.Redirect(w, r, urlDelete, http.StatusFound) -} - func save(w http.ResponseWriter, r *http.Request) { - oldTitle := r.PathValue("note") - title := r.FormValue("title") + title := r.PathValue("note") body := r.FormValue("body") - note := ¬es.Note{Title: title, Body: []byte(body)} note.Save() - - if oldTitle != title { - notes.DeleteNote(oldTitle) - } - http.Redirect(w, r, myurls.Reverse("view", urls.Repl{"note": title}), http.StatusFound) } diff --git a/templates/edit.tmpl.html b/templates/edit.tmpl.html index d6ea5b8..bc2b010 100644 --- a/templates/edit.tmpl.html +++ b/templates/edit.tmpl.html @@ -3,10 +3,7 @@ {{define "main"}}