diff --git a/myapp/ns_page/templates/guest/page.html b/myapp/ns_page/templates/guest/page.html index 74492ef..83b69b8 100644 --- a/myapp/ns_page/templates/guest/page.html +++ b/myapp/ns_page/templates/guest/page.html @@ -1,36 +1,24 @@ {% extends "/public/skeleton.html" %} {% block content %} -{% raw %} +Назад

- -{{ page.title }}

+{{ pagedata['page'].title }}
-
-
- - {{ tag.name }}  - -
-
+

+{% for tagLink in pagedata['page'].tags %} +{{ tagLink.tag.name }}; +{% endfor %} +

- +{{ pagedata['page'].body|safe }} -
-
- {{ page.user.name }}  -Создано: {{ page.created }}  -Обновлено: {{ page.updated }} -
-
- -{% endraw %} {% endblock %} {% block breadcrumb %} diff --git a/myapp/ns_page/templates/guest/pages.html b/myapp/ns_page/templates/guest/pages.html index 1cbcdac..0639904 100644 --- a/myapp/ns_page/templates/guest/pages.html +++ b/myapp/ns_page/templates/guest/pages.html @@ -4,7 +4,6 @@

Статьи

-
diff --git a/myapp/ns_page/templates/user/page_add.html b/myapp/ns_page/templates/user/page_add.html deleted file mode 100644 index b4d13d3..0000000 --- a/myapp/ns_page/templates/user/page_add.html +++ /dev/null @@ -1,76 +0,0 @@ -{% extends "/private/skeleton.html" %} -{% block content %} - - -

- -Новая страница -

-
- -
- - -
- -
- - -
- -
-
- -
-
- -{% endblock %} - -{% block breadcrumb %} -{% raw %} -
    -
    2. -
  2. Статьи
    3. -
  3. Новая статья
    4. -
-{% endraw %} -{% endblock %} - -{% block script %} - -{% endblock %} diff --git a/myapp/ns_page/templates/user/pages.html b/myapp/ns_page/templates/user/pages.html index 10882be..9b62c12 100644 --- a/myapp/ns_page/templates/user/pages.html +++ b/myapp/ns_page/templates/user/pages.html @@ -33,22 +33,15 @@
- - -
-
-от до -
-
+{% include 'pagination-curl.html' %} {% include 'inc/pages.html' %} - +{% include 'pagination-curl.html' %} {% endblock %} {% block script %} - - - + {% endblock %} diff --git a/myapp/ns_tag/templates/guest/tags.html b/myapp/ns_tag/templates/guest/tags.html index 14af67f..a132406 100644 --- a/myapp/ns_tag/templates/guest/tags.html +++ b/myapp/ns_tag/templates/guest/tags.html @@ -1,51 +1,18 @@ -{% extends "skeleton.html" %} +{% extends "/public/skeleton.html" %} {% block content %} -

Список тегов

+

Список тегов

-{% raw %} -
-
-
-{{ tag.name }} -
-
-
-{% endraw %} +

{% for tag in pagedata['tags'] %} +{{ tag.name }} / +{% endfor %}

{% endblock %} {% block breadcrumb %} -
    -
    2. -
  2. Список тегов
    3. +
      +
    1. Домой
      2. +
    2. Список тегов
    {% endblock %} - -{% block script %} - -{% endblock %} diff --git a/myapp/ns_tag/views_guest.py b/myapp/ns_tag/views_guest.py index bf3bedd..2f96fbd 100644 --- a/myapp/ns_tag/views_guest.py +++ b/myapp/ns_tag/views_guest.py @@ -4,7 +4,7 @@ __email__ = 'remizoffalex@mail.ru' from flask import abort, render_template -from .. import app, models +from .. import app, lib, models def tags(): @@ -12,11 +12,14 @@ def tags(): """ pagedata = {} pagedata['title'] = 'Список меток - ' + app.config['TITLE'] + pagedata['tags'] = models.db_session.query( + models.Tag + ).all() body = render_template('guest/tags.html', pagedata=pagedata) return body -def tag_id(id): +def tag_id(id: int, page: int = 1): """Метка """ pagedata = {} @@ -32,13 +35,28 @@ def tag_id(id): tag.name, app.config['TITLE'] ) - pagedata['tag'] = tag.as_dict() + pagedata['tag'] = tag - pagedata['pagination'] = { - "page": 1, - "per_page": app.config['ITEMS_ON_PAGE'], - "size": 0 - } + pages_idx = models.db_session.query( + models.TagPage.page_id + ).filter( + models.TagPage.tag_id==id + ) + pages = models.db_session.query( + models.Page + ).filter( + models.Page.id.in_(pages_idx) + ).order_by( + models.Page.title.asc() + ) + + pagedata['pagination'] = lib.Pagination( + page, + app.config['ITEMS_ON_PAGE'], + pages.count() + ) + pagedata['pagination'].url = '/tag/{}/pages'.format(id) + pagedata['pages'] = pages.all() body = render_template('guest/tag.html', pagedata=pagedata) return body diff --git a/myapp/ns_user/routes.py b/myapp/ns_user/routes.py index 05280fd..8068946 100644 --- a/myapp/ns_user/routes.py +++ b/myapp/ns_user/routes.py @@ -31,12 +31,12 @@ def user_pages(id: int, page: int): @app.route('/users', defaults={'page': 1}) @app.route('/users/') -def users(page: int): +def users_list(page: int): """ Список пользователей """ if lib.get_user(): - return views_user.users(page) + return views_user.users_list(page) else: - return views_guest.users(page) + return views_guest.users_list(page) abort(404) diff --git a/myapp/ns_user/templates/guest/user.html b/myapp/ns_user/templates/guest/user.html index edccbf7..9b2895e 100644 --- a/myapp/ns_user/templates/guest/user.html +++ b/myapp/ns_user/templates/guest/user.html @@ -1,43 +1,21 @@ {% extends "/public/skeleton.html" %} {% block content %} -{% raw %} -

    - -{{ user.name }}

    +Назад +

    {{ pagedata['user'].name }}

    -{% endraw %} -{% include 'user_menu.html' %} -{% raw %} +{% include 'guest/user_menu.html' %} -Зарегистрирован: {{ user.created }} - -{% endraw %} +

    Зарегистрирован: {{ pagedata['user'].created }} {% endblock %} {% block breadcrumb %} -{% raw %} -

      -
      2. -
    2. Список пользователей
      3. -
    3. {{ user.name }}
      4. +
        +
      1. Домой
        2. +
      2. Список пользователей
        3. +
      3. {{ pagedata['user'].name }}
      -{% endraw %} -{% endblock %} - -{% block script %} - {% endblock %} diff --git a/myapp/ns_user/templates/guest/user_menu.html b/myapp/ns_user/templates/guest/user_menu.html index fd68e9e..ee3d51a 100644 --- a/myapp/ns_user/templates/guest/user_menu.html +++ b/myapp/ns_user/templates/guest/user_menu.html @@ -1,13 +1,5 @@ -
      -
      - -
      - - - -
      Статьи
      -Статьи - -
      -
      +

      +{{ pagedata['user'].name }} / +Статьи +

      diff --git a/myapp/ns_user/templates/guest/user_pages.html b/myapp/ns_user/templates/guest/user_pages.html index eb5fec4..ce1d63f 100644 --- a/myapp/ns_user/templates/guest/user_pages.html +++ b/myapp/ns_user/templates/guest/user_pages.html @@ -1,119 +1,24 @@ -{% extends "skeleton.html" %} +{% extends "/public/skeleton.html" %} {% block content %} -{% raw %} -

      - -{{ user.name }}

      +Назад +

      {{ pagedata['user'].name }}

      -{% endraw %} -{% include 'user_menu.html' %} +{% include 'guest/user_menu.html' %} - +{% include 'pagination-curl.html' %} {% include 'inc/pages.html' %} - +{% include 'pagination-curl.html' %} {% endblock %} {% block breadcrumb %} -{% raw %} -
        -
        2. -
      2. Список пользователей
        3. -
      3. {{ user.name }}
        4. +
          +
        1. Домой
          2. +
        2. Список пользователей
          3. +
        3. {{ pagedata['user'].name }}
        -{% endraw %} -{% endblock %} - -{% block script %} - - - {% endblock %} diff --git a/myapp/ns_user/templates/guest/users.html b/myapp/ns_user/templates/guest/users.html index 3190eea..df2eb2e 100644 --- a/myapp/ns_user/templates/guest/users.html +++ b/myapp/ns_user/templates/guest/users.html @@ -4,87 +4,17 @@

        Список пользователей

        - +{% include 'pagination-curl.html' %} {% include '/inc/users.html' %} - +{% include 'pagination-curl.html' %} {% endblock %} {% block breadcrumb %} -
          -
          2. -
        2. Список пользователей
          3. +
            +
          • Домой
            • +
          • Список пользователей
        {% endblock %} - -{% block script %} - - - -{% endblock %} diff --git a/myapp/ns_user/views_guest.py b/myapp/ns_user/views_guest.py index e0ea444..f8eec1d 100644 --- a/myapp/ns_user/views_guest.py +++ b/myapp/ns_user/views_guest.py @@ -4,7 +4,7 @@ __email__ = 'remizoffalex@mail.ru' from flask import abort, render_template -from .. import app, models +from .. import app, lib, models def user_id(id): @@ -18,16 +18,15 @@ def user_id(id): ).first() if user is None: abort(404) - pagedata['user'] = user.as_dict() + pagedata['user'] = user pagedata['title'] = '{} - {}'.format(user.name, app.config['TITLE']) body = render_template('/guest/user.html', pagedata=pagedata) return body -def user_pages(id): +def user_pages(id: int, page: int = 1): """Список статей пользователя """ - pagedata = {} user = models.db_session.query( models.User ).filter( @@ -35,30 +34,49 @@ def user_pages(id): ).first() if user is None: abort(404) + pagedata = {} pagedata['user'] = user.as_dict() pagedata['title'] = '{} - {}'.format(user.name, app.config['TITLE']) - pagedata['pagination'] = { - "page": 1, - "per_page": app.config['ITEMS_ON_PAGE'], - "size": 0 - } + pages = models.db_session.query( + models.Page + ).filter( + models.Page.user_id == id + ).order_by( + models.Page.title.asc() + ) + + pagedata['pagination'] = lib.Pagination( + page, + app.config['ITEMS_ON_PAGE'], + pages.count() + ) + pagedata['pagination'].url = '/user/{}/pages'.format(user_id) + pagedata['pages'] = pages.all() body = render_template('/guest/user_pages.html', pagedata=pagedata) return body -def users(page: int): +def users_list(page: int = 1): """Список пользователей """ pagedata = {} pagedata['title'] = 'Список пользователей - ' + app.config['TITLE'] - pagedata['pagination'] = { - "page": page, - "per_page": app.config['ITEMS_ON_PAGE'], - "size": 0 - } + users = models.db_session.query( + models.User + ).order_by( + models.User.name.asc() + ) + + pagedata['pagination'] = lib.Pagination( + page, + app.config['ITEMS_ON_PAGE'], + users.count() + ) + pagedata['pagination'].url = '/users' + pagedata['users'] = users.all() body = render_template('/guest/users.html', pagedata=pagedata) return body diff --git a/myapp/ns_user/views_user.py b/myapp/ns_user/views_user.py index 7b449af..fae55cb 100644 --- a/myapp/ns_user/views_user.py +++ b/myapp/ns_user/views_user.py @@ -48,7 +48,7 @@ def user_pages(id): return body -def users(page: int): +def users_list(page: int): """Список пользователей """ pagedata = {} diff --git a/myapp/templates/footer.html b/myapp/templates/footer.html index 1bffc9e..4fadbee 100644 --- a/myapp/templates/footer.html +++ b/myapp/templates/footer.html @@ -1,7 +1,3 @@ -
        -
        -
        +

        © RemiZOffAlex -

        -
        -
        +

        diff --git a/myapp/templates/inc/pages.html b/myapp/templates/inc/pages.html index ffdc0c3..2a29db0 100644 --- a/myapp/templates/inc/pages.html +++ b/myapp/templates/inc/pages.html @@ -1,12 +1,12 @@ - +
        {% for page in pagedata['pages'] %} diff --git a/myapp/templates/inc/users.html b/myapp/templates/inc/users.html index 43264f9..820dee9 100644 --- a/myapp/templates/inc/users.html +++ b/myapp/templates/inc/users.html @@ -1,16 +1,14 @@ -{% raw %} -
        -
        -{{ user.name }} +
        -{{ page.title }} +

        {{ page.title }}

        -{% for tagLink in page.tags %} +

        {% for tagLink in page.tags %} {{ tagLink.tag.name }} -{% endfor %} +{% endfor %}
        +{% for user in pagedata['users'] %} + + + +{% endfor %} +
        +

        {{ user.name }}

        -
        -
        - -Создан: {{ user.created }} - -
        -
        +

        {% for tagLink in user.tags %} +{{ tagLink.tag.name }} +{% endfor %}

        - - -{% endraw %} +
        diff --git a/myapp/templates/pagination-curl.html b/myapp/templates/pagination-curl.html new file mode 100644 index 0000000..7df4f31 --- /dev/null +++ b/myapp/templates/pagination-curl.html @@ -0,0 +1,17 @@ +{% if pagedata['pagination'].pages > 1 %} + + + + +
        + +{% for item in range(pagedata['pagination'].pages) %} +{% if pagedata['pagination'].current==item+1 %} +[{{ item +1}}] +{% else %} +{{ item +1}} +{% endif %} +{% endfor %} + +
        +{% endif %} diff --git a/myapp/templates/private/app.js b/myapp/templates/private/app.js index 0a3ad3d..048fec8 100644 --- a/myapp/templates/private/app.js +++ b/myapp/templates/private/app.js @@ -11,5 +11,4 @@ let routes = {}; {% include '/private/components/inc.j2' %} {% include '/private/domains/inc.j2' %} - -{% include '/routes.js' %} +{% include '/private/routes.js' %} diff --git a/myapp/templates/private/domains/page/pages.js b/myapp/templates/private/domains/page/pages.js index 165f54f..49534ff 100644 --- a/myapp/templates/private/domains/page/pages.js +++ b/myapp/templates/private/domains/page/pages.js @@ -12,7 +12,11 @@ function Pages() { clickHandler: pages_get, order: 'asc', }), - pages: [], + raw_pages: [], + get pages() { + let result = data.raw_pages.filter(question_filter); + return result; + }, pagination: Pagination({ clickHandler: pages_get, prefix_url: '/pages' @@ -25,8 +29,18 @@ function Pages() { ]); return result; }; + function page_filter(page) { + let filter = data.filter.data; + let value = filter.value; + if (value.length < 1) { + return true; + } + if (page.title.toLowerCase().includes(value.toLowerCase())) { + return true; + } + return false; + }; function pages_get() { - let order_by = data.order_by.data; let pagination = data.pagination.data; m.request({ url: '/api', @@ -55,7 +69,7 @@ function Pages() { }).then( function(response) { if ('result' in response[0]) { - data.pages = response[0]['result']; + data.raw_pages = response[0]['result']; } if ('result' in response[1]) { data.pagination.size = response[1]['result']; diff --git a/myapp/templates/routes.js b/myapp/templates/private/routes.js similarity index 100% rename from myapp/templates/routes.js rename to myapp/templates/private/routes.js diff --git a/myapp/templates/public/app.js b/myapp/templates/public/app.js index dcae827..b8ecc22 100644 --- a/myapp/templates/public/app.js +++ b/myapp/templates/public/app.js @@ -11,5 +11,4 @@ let routes = {}; {% include '/public/components/inc.j2' %} {% include '/public/domains/inc.j2' %} - -{% include '/routes.js' %} +{% include '/public/routes.js' %} diff --git a/myapp/templates/public/navbar.html b/myapp/templates/public/navbar.html index 4cde13c..e583a7e 100644 --- a/myapp/templates/public/navbar.html +++ b/myapp/templates/public/navbar.html @@ -1,13 +1,7 @@ -
        -
        +

        +Домой / +Статьи / +Метки / +Пользователи - -Статьи -Метки -Пользователи -API JSON-RPC - - - -

        -
        +

        diff --git a/myapp/templates/public/routes.js b/myapp/templates/public/routes.js new file mode 100644 index 0000000..a69027a --- /dev/null +++ b/myapp/templates/public/routes.js @@ -0,0 +1,14 @@ +m.route.prefix = ''; +function layout_decorator(controller) { + return { + render: function(vnode) { + return m(Layout, m(controller, vnode.attrs)) + } + } +}; + +m.route( + vroot, + "/", + routes +);