From 3a0810adc919d82352fb8b877f9be9c7262d82f9 Mon Sep 17 00:00:00 2001 From: Daniel Muckerman Date: Sun, 1 Nov 2020 11:54:38 -0500 Subject: [PATCH] More CSS overhaul --- app.py | 18 ++++++++++++++- pocket/readitlater.db | Bin 188416 -> 188416 bytes static/style.css | 30 +++++++++++++++++++++++++ templates/article.j2 | 36 +++++++++++++++++++++++++----- templates/bookmarklet.j2 | 5 +++++ templates/fragments/cell.j2 | 40 ++++++++++++++++++++++++++++++++++ templates/fragments/navbar.j2 | 36 +++++++++++++++++++++++++++--- templates/list.j2 | 16 +++++--------- 8 files changed, 162 insertions(+), 19 deletions(-) create mode 100644 templates/fragments/cell.j2 diff --git a/app.py b/app.py index 5dc7691..21790e7 100644 --- a/app.py +++ b/app.py @@ -131,7 +131,9 @@ def read_article(article_id): conn = sqlite3.connect('pocket/readitlater.db') c = conn.cursor() - c.execute("SELECT * FROM articles where id=?", (article_id,)) + # c.execute("SELECT * FROM articles where id=?", (article_id,)) + c.execute("SELECT articles.id, url, content, title, byline, read FROM articles INNER JOIN saved_articles on saved_articles.article_id = articles.id WHERE articles.id=?", (article_id, )) + rows = c.fetchall() conn.commit() conn.close() @@ -217,6 +219,20 @@ def archive_article(article_id): return redirect(url_for('index')) +@ldap.login_required +@app.route('/unarchive/') +def unarchive_article(article_id): + conn = sqlite3.connect('pocket/readitlater.db') + c = conn.cursor() + + c.execute("UPDATE saved_articles SET read=0 WHERE user=? AND article_id=?", (session['user_id'], article_id)) + + conn.commit() + conn.close() + + return redirect(url_for('archived')) + + @app.route('/logout') def logout(): session.pop('user_id', None) diff --git a/pocket/readitlater.db b/pocket/readitlater.db index 8715a7592c3654d5da6ee690b7c5ba42b6eff96e..750d3684166289b1380fdf4363a5f278e74fdf08 100644 GIT binary patch delta 292 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 fV>&-K#|Hw(DnD9sI -
Dark Mode
{{ user['userName'] }}
#} - - - + +
+ {% if article[5] == 1 %} + + {% if article[5] == 1 %} + + {% else %} + {% endif %} - $('#article img').css('max-width', '100%'); $('#article img').css('height', 'auto'); + +$(function () { + $('[data-toggle="tooltip"]').tooltip() +}) {% endblock %} \ No newline at end of file diff --git a/templates/bookmarklet.j2 b/templates/bookmarklet.j2 index 6e37817..fada2ad 100644 --- a/templates/bookmarklet.j2 +++ b/templates/bookmarklet.j2 @@ -40,4 +40,9 @@ {% block scripts %} {{ super() }} + {% endblock %} \ No newline at end of file diff --git a/templates/fragments/cell.j2 b/templates/fragments/cell.j2 new file mode 100644 index 0000000..a70f145 --- /dev/null +++ b/templates/fragments/cell.j2 @@ -0,0 +1,40 @@ +
+ {{ article[2] }} + {{ article[3] }} + + {% if request.path == url_for('archived') %} + + + {% else %} + + + {% endif %} +      + + + +
\ No newline at end of file diff --git a/templates/fragments/navbar.j2 b/templates/fragments/navbar.j2 index 6e1dce6..1eac6bd 100644 --- a/templates/fragments/navbar.j2 +++ b/templates/fragments/navbar.j2 @@ -30,10 +30,40 @@
{% if request.path != url_for('bookmarklet') %} - - Add Link + {# #} + + {# Add Link #} + + {% endif %} - Logout + {# Logout #} + +
\ No newline at end of file diff --git a/templates/list.j2 b/templates/list.j2 index d57357d..f4c6d7f 100644 --- a/templates/list.j2 +++ b/templates/list.j2 @@ -32,16 +32,7 @@
{% for article in articles|reverse %} -
- {{ article[2] }} - {{ article[3] }} -
- - Archive -      - Delete - -
+ {% include "fragments/cell.j2" %} {% endfor %}
@@ -56,4 +47,9 @@ {{ super() }} {# #} + {% endblock %} \ No newline at end of file