diff --git a/app.py b/app.py index 5ec5658..6f4be95 100644 --- a/app.py +++ b/app.py @@ -29,10 +29,22 @@ def book(id): @app.route("/book//mark", methods=["POST"]) def bookmark(id): page = request.form["page"] + note = request.form["note"] csr = get_cursor() - csr.execute("insert into bookmarks(book, page) values(%s, %s)", (id, page,)) + csr.execute( + "insert into bookmarks(book, page, note) values(%s, %s, %s)", + (id, page, note)) return redirect(url_for("book", id=id), code=303) +@app.route("/book/new", methods=["POST"]) +def new_book(): + title = request.form["title"] + csr = get_cursor() + csr.execute("insert into books(title, current) values(%s, true) returning *", (title,)) + r = csr.fetchone() + return redirect(url_for("book", id=r.id), code=303) + + def get_cursor(): db = get_db() csr = db.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor) diff --git a/templates/book.html b/templates/book.html index 7cad313..27bef4b 100644 --- a/templates/book.html +++ b/templates/book.html @@ -6,29 +6,43 @@ Lesetagebuch: {{book.title}}

{{ book.title }}

- + +
{% for bookmark in bookmarks %} - - - - + + + + + + + + + {% endfor %}
- {{bookmark.ts.strftime("%Y-%m-%d %H:%M%z")}} - - {{bookmark.page}} -
+ {{bookmark.ts.strftime("%Y-%m-%d %H:%M%z")}} + + {{bookmark.page}} +
+ {% if bookmark.note %} + {{bookmark.note}} + {% endif %} +
diff --git a/templates/home.html b/templates/home.html index 335f5ae..802bcb1 100644 --- a/templates/home.html +++ b/templates/home.html @@ -14,5 +14,9 @@ {% endfor %} +
+ + +