diff options
| -rw-r--r-- | data/templates/recipe.html | 42 | ||||
| -rw-r--r-- | data/templates/recipe_edit.html | 33 | ||||
| -rw-r--r-- | web/handler.go | 81 | ||||
| -rw-r--r-- | web/router.go | 2 |
4 files changed, 118 insertions, 40 deletions
diff --git a/data/templates/recipe.html b/data/templates/recipe.html index 536cac9..a35cc49 100644 --- a/data/templates/recipe.html +++ b/data/templates/recipe.html @@ -25,51 +25,13 @@ <main> <img src="./recipe/image?id={{.Id}}" alt="Recipe image"> <h2>Recipe description</h2> - <button id="editbtn" style="display:block" onclick=startEditMode()>edit</button> - <button id="cancelbtn" style="display:none" onclick=cancelEditMode()>abort</button> - <button id="savebtn" style="display:none" onclick=saveDescriptionMarkdown()>save</button> - <pre id="description_md" style="display:none;" contenteditable="true">{{.DescriptionMarkdown}}</pre> - <div id="rendered_description_md" style="display:block;"> - {{.RenderedDescriptionMarkdown}} - </div> + <a href="./recipe/edit?id={{.Id}}"><button>edit</button></a> + {{.RenderedDescriptionMarkdown}} <footer> <hr> <p>The <a href="https://xengineering.eu/git/ceres">Ceres</a> recipe server is licensed under <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPL v3</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> </footer> </main> - - <script> - var editbtn = document.getElementById("editbtn"); - var cancelbtn = document.getElementById("cancelbtn"); - var savebtn = document.getElementById("savebtn"); - var description_md = document.getElementById("description_md"); - var rendered_description_md = document.getElementById("rendered_description_md"); - - function startEditMode() { - editbtn.style.display = "none"; - rendered_description_md.style.display = "none"; - cancelbtn.style.display = "block"; - savebtn.style.display = "block"; - description_md.style.display = "block"; - } - - function cancelEditMode() { - window.location.reload(true); - } - - function saveDescriptionMarkdown() { - var xhttp = new XMLHttpRequest(); - xhttp.onreadystatechange = function() { - if (this.readyState == 4) { - window.location.reload(true); - } - } - xhttp.open("POST", window.location.href, true); - xhttp.send(description_md.innerHTML.replaceAll("<br>", "\n")); - } - </script> - </body> - </html> diff --git a/data/templates/recipe_edit.html b/data/templates/recipe_edit.html new file mode 100644 index 0000000..b5c9672 --- /dev/null +++ b/data/templates/recipe_edit.html @@ -0,0 +1,33 @@ +<!DOCTYPE html> + +<html> + + <head> + + <title>Recipes</title> + + <meta charset="utf-8"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="../../../static/style.css" type="text/css"> + + </head> + + <body> + <header> + <h1>Edit a recipe</h1> + </header> + + <main> + <p>ID: {{.Id}}</p> + <form action="/add_recipes" method="post" id="recipe_form"> + <input placeholder="Title" type="text" id="custom_title" name="title" value="{{.Title}}"><br> + <input placeholder="Link (optional)" type="text" id="custom_link" name="url" value="{{.UpstreamUrl}}"><br> + <label for="image">New image (optional):</label> + <input id="image" type="file"><br> + <pre form="recipe_form" name="description_markdown" contenteditable="true"><code>{{.DescriptionMarkdown}}</code></pre> + <button type="submit">save</button> + </form> + <a href="/recipe?id={{.Id}}"><button>cancel</button></a> + </main> + </body> +</html> diff --git a/web/handler.go b/web/handler.go index cab38ed..07d04fa 100644 --- a/web/handler.go +++ b/web/handler.go @@ -148,6 +148,87 @@ func recipe(db *utils.Database, templateRoot string) func(http.ResponseWriter, * } } +func recipe_edit(db *utils.Database, templateRoot string) func(http.ResponseWriter, *http.Request) { + + return func(w http.ResponseWriter, r *http.Request) { + + // get id from URL parameters + ids := r.URL.Query()["id"] + if len(ids) != 1 { + utils.Err(w, 3, len(ids)) + return + } + idStr := ids[0] + + // validate id + idRegex := regexp.MustCompile(VALID_ID_REGEX) + if !(idRegex.MatchString(idStr)) { + utils.Err(w, 4, idStr, VALID_ID_REGEX) + return + } + + if r.Method == "GET" { + + // get data from database + cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr) + log.Printf("Query: %s", cmd) + rows, err := db.Backend.Query(cmd) + if err != nil { + utils.Err(w, 5, err) + return + } + defer rows.Close() + + // prepare data store + type Element struct { + Id string + Title string + UpstreamUrl string + DescriptionMarkdown string + RenderedDescriptionMarkdown string + } + elements := make([]Element, 0) + + // scan database rows to data store + for rows.Next() { + var element Element + element.Id = idStr + err := rows.Scan(&element.Title, &element.UpstreamUrl, &element.DescriptionMarkdown) + if err != nil { + utils.Err(w, 2) + return + } else { + elements = append(elements, element) + } + } + + // check result + if len(elements) != 1 { + utils.Err(w, 6, len(elements)) + return + } + + // render markdown + // var buf bytes.Buffer + // goldmark.Convert([]byte(elements[0].DescriptionMarkdown), &buf) + // elements[0].RenderedDescriptionMarkdown = buf.String() + + // render and return template + path := filepath.Join(templateRoot, "recipe_edit.html") + utils.ServeTemplate(w, "recipe", path, elements[0]) + } + + if r.Method == "POST" { + + // read request body + buffer,_ := ioutil.ReadAll(r.Body) // FIXME error handling + body := string(buffer) + updateRecipe(db, body, idStr) + + } + } +} + func updateRecipe(db *utils.Database, body string, idStr string) { // execute SQL UPDATE diff --git a/web/router.go b/web/router.go index 5b972c2..ec67399 100644 --- a/web/router.go +++ b/web/router.go @@ -14,6 +14,8 @@ func RunServer(config utils.HttpConfig, db *utils.Database) { http.HandleFunc("/recipe", recipe(db, config.Templates)) + http.HandleFunc("/recipe/edit", recipe_edit(db, config.Templates)) + http.HandleFunc("/recipe/image", image(config.Storage)) http.HandleFunc("/add_recipes", add_recipes(db, config.Storage, config.Static)) |