diff --git a/.gitignore b/.gitignore index bdac4f8..9c35e69 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,8 @@ site-*.conf run_8180.py .env alembic.ini -venv/ -venv-*/ +venv +venv-* .venv env diff --git a/README.md b/README.md index b9d20e8..941565a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ suitable as a community or team knowledge base. ## Requirements + **Python** 3.6+. -+ **Flask** web framework (and Flask-Login / Flask-WTF extensions). ++ **Flask** web framework (and Flask-Login / Flask-WTF / Flask-Arrest extensions). + **Peewee** ORM. + **Markdown** for page rendering. + **Python-I18n**. diff --git a/app.py b/app.py index eec7bd5..ac847bb 100644 --- a/app.py +++ b/app.py @@ -17,6 +17,7 @@ from flask import ( render_template, send_from_directory) from flask_login import LoginManager, login_user, logout_user, current_user, login_required from flask_wtf import CSRFProtect +#from flask_arrest import RestBlueprint, serialize_response from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.routing import BaseConverter from peewee import * @@ -46,9 +47,9 @@ PING_RE = r'(?{0}').format(x), 'app_version': __version__, - 'material_icons_url': _getconf('site', 'material_icons_url') + 'material_icons_url': _getconf('site', 'material_icons_url'), + 'min': min } @login_manager.user_loader diff --git a/requirements.txt b/requirements.txt index 18bfb00..b498231 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,6 @@ peewee markdown flask-login flask-wtf -python-i18n \ No newline at end of file +python-i18n +flask-arrest +python-dotenv diff --git a/templates/base.jinja2 b/templates/base.jinja2 index 512e33b..18890f4 100644 --- a/templates/base.jinja2 +++ b/templates/base.jinja2 @@ -13,8 +13,11 @@ {% endif %} {% block json_info %}{% endblock %} + {% block ldjson %}{% endblock %} - +
{{ app_name }} diff --git a/templates/home.jinja2 b/templates/home.jinja2 index 90dc091..44abd83 100644 --- a/templates/home.jinja2 +++ b/templates/home.jinja2 @@ -15,33 +15,9 @@

{{ T('latest-notes') }}


- + + {% from "macros/nl.jinja2" import nl_list with context %} + {{ nl_list(new_notes) }} diff --git a/templates/listrecent.jinja2 b/templates/listrecent.jinja2 index 5df3b13..3f19545 100644 --- a/templates/listrecent.jinja2 +++ b/templates/listrecent.jinja2 @@ -4,39 +4,7 @@

Notes by date

-

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

- - + {% from "macros/nl.jinja2" import nl_list with context %} + {{ nl_list(notes, page_n=page_n, total_count=total_count) }}
{% endblock %} diff --git a/templates/listtag.jinja2 b/templates/listtag.jinja2 index 46d6ec3..c33b6ca 100644 --- a/templates/listtag.jinja2 +++ b/templates/listtag.jinja2 @@ -8,42 +8,8 @@
{{ T('notes-tagged') }}
{% if total_count > 0 %} -

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

- - + {% from "macros/nl.jinja2" import nl_list with context %} + {{ nl_list(l, page_n=page_n, total_count=total_count, hl_tags=(tagname,)) }} {% else %}

{{ T('notes-tagged-empty') }}

{% endif %} diff --git a/templates/macros/nl.jinja2 b/templates/macros/nl.jinja2 new file mode 100644 index 0000000..c34f963 --- /dev/null +++ b/templates/macros/nl.jinja2 @@ -0,0 +1,50 @@ + + +{% macro nl_list(l, page_n=None, total_count=None, hl_tags=(), other_url='p/most_recent') %} +{% if page_n and total_count %} +

+ Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} + of {{ total_count }} total.

+{% endif %} + + +{% endmacro %} + diff --git a/templates/search.jinja2 b/templates/search.jinja2 index ddbf029..b883186 100644 --- a/templates/search.jinja2 +++ b/templates/search.jinja2 @@ -21,11 +21,8 @@ {% if results %}

Search results for {{ q }}

- + {% from "macros/nl.jinja2" import nl_list with context %} + {{ nl_list(l, other_url=None) }} {% elif q %}

{{ T('search-no-results') }} {{ q }}

{% else %}