Add ns page

myapp/__init__.py

@@ -48,6 +48,9 @@ from . import ns_api
 # Авторизация
 from . import ns_login
 
+# Статьи
+from . import ns_page
+
 # Профиль
 from . import ns_profile
 

myapp/ns_page/__init__.py

@@ -0,0 +1,18 @@
+__author__ = 'RemiZOffAlex'
+__copyright__ = '(c) RemiZOffAlex'
+__license__ = 'MIT'
+__email__ = 'remizoffalex@mail.ru'
+__url__ = 'https://remizoffalex.ru'
+
+import os
+import jinja2
+
+from . import routes
+from .. import app
+
+
+my_loader = jinja2.ChoiceLoader([
+    app.jinja_loader,
+    jinja2.FileSystemLoader(os.path.dirname(os.path.abspath(__file__)) + "/templates"),
+])
+app.jinja_loader = my_loader

myapp/ns_page/routes.py

@@ -0,0 +1,47 @@
+__author__ = 'RemiZOffAlex'
+__email__ = 'remizoffalex@mail.ru'
+__url__ = 'https://remizoffalex.ru/'
+
+from flask import abort
+
+from . import views_user, views_guest
+from .. import app, lib
+from ..decorators import login_required
+
+
+@app.route('/page/<int:id>')
+def page_id(id):
+    """Статья"""
+    if lib.get_user():
+        return views_user.page_id(id)
+    else:
+        return views_guest.page_id(id)
+
+
+@app.route('/page/<int:id>/edit')
+def page_edit(id):
+    """Редактирование статьи"""
+    if lib.get_user():
+        return views_user.page_edit(id)
+    else:
+        abort(404)
+
+
+@app.route('/page/add')
+def page_add():
+    """Добавление новой статьи
+    """
+    if lib.get_user():
+        return views_user.page_add()
+    else:
+        abort(404)
+
+
+@app.route('/pages', defaults={'page': 1})
+@app.route('/pages/<int:page>')
+def pages(page):
+    """Список статей"""
+    if lib.get_user():
+        return views_user.pages(page)
+    else:
+        return views_guest.pages(page)

myapp/ns_page/templates/guest/page.html

@@ -0,0 +1,52 @@
+{% extends "skeleton.html" %}
+{% block content %}
+{% raw %}
+
+<h3>
+<a class="btn btn-outline-secondary" href="/pages"><i class="fa fa-chevron-left"></i></a>
+{{ page.title }}</h3>
+<hr />
+
+<div class="row">
+<div class="col small text-muted">
+<span v-for="(tag, tagIdx) in page.tags">
+<i class="fa fa-tag"></i> <a class="text-monospace" :href="'/tag/' + tag.id">{{ tag.name }}</a>&nbsp;
+</span>
+</div>
+</div>
+
+<span v-html="page.body"></span>
+
+<div class="row">
+<div class="col small text-muted">
+<i class="fa fa-user"></i> <a class="text-monospace" :href="'/user/' + page.user.id">{{ page.user.name }}</a>&nbsp;
+Создано: {{ page.created }}&nbsp;
+Обновлено: {{ page.updated }}
+</div>
+</div>
+
+{% endraw %}
+{% endblock %}
+
+{% block breadcrumb %}
+{% raw %}
+<ol class="breadcrumb mt-3">
+    <li class="breadcrumb-item"><a href="/"><i class="fa fa-home"></i></a></li>
+    <li class="breadcrumb-item"><a href="/pages">Список статей</a></li>
+    <li class="breadcrumb-item active">{{ page.title }}</li>
+</ol>
+{% endraw %}
+{% endblock %}
+
+{% block script %}
+<script type="text/javascript">
+var app = new Vue({
+    el: '#app',
+    data: {
+        page: {{ pagedata['page']|tojson|safe }},
+    },
+    methods: {
+    },
+})
+</script>
+{% endblock %}

myapp/ns_page/templates/guest/pages.html

@@ -0,0 +1,135 @@
+{% extends "skeleton.html" %}
+{% block content %}
+{% raw %}
+
+<h3>Статьи</h3>
+<hr />
+
+<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
+
+<div class="row" v-if="firstAlpha">
+<div class="col py-2 text-center">
+от <span class="text-danger" v-html="firstAlpha"></span> до <span class="text-danger" v-html="lastAlpha"></span>
+</div>
+</div>
+
+<div class="row" v-for="(page, pageIdx) in pages">
+<div class="col py-2" :class="{'bg-light': pageIdx % 2}">
+<a :href="'/page/' + page.id">{{ page.title }}</a>
+
+<div class="row">
+<div class="col small text-muted">
+<span v-for="(tag, tagIdx) in page.tags">
+<i class="fa fa-tag"></i> <a class="text-monospace" :href="'/tag/' + tag.tag_id">{{ tag.name }}</a>&nbsp;
+</span>
+</div>
+</div>
+
+<div class="row">
+<div class="col small text-muted">
+<i class="fa fa-user"></i> <a :href="'/user/' + page.user.id">{{ page.user.name }}</a>&nbsp;
+Создано: {{ page.created }}&nbsp;
+Обновлено: {{ page.updated }}
+</div>
+</div>
+
+</div>
+</div>
+
+<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
+
+<backtotop-component></backtotop-component>
+
+{% endraw %}
+{% endblock %}
+
+{% block script %}
+<script type="text/javascript" src="/static/components/backtotop.js"></script>
+<link rel="stylesheet" href="/static/components/backtotop.css"></link>
+<script type="text/javascript" src="/static/components/pagination.js"></script>
+
+<script>
+var app = new Vue({
+    el: '#app',
+    data: {
+        pages: [],
+        pagination: {{ pagedata['pagination']|tojson|safe }},
+    },
+    methods: {
+        getPages: function() {
+            /* Получить список статей */
+            let vm = this;
+            axios.post(
+                '/api',
+                {
+                    "jsonrpc": "2.0",
+                    "method": "pages",
+                    "params": {
+                        "page": vm.pagination.page
+                    },
+                    "id": 1
+                }
+            ).then(
+                function(response) {
+                    if ('result' in response.data) {
+                        vm.pages = response.data['result'];
+                    }
+                }
+            );
+        },
+    },
+    created: function() {
+        let vm = this;
+        axios.post(
+            '/api',
+            [
+                {
+                    "jsonrpc": "2.0",
+                    "method": "pages",
+                    "params": {
+                        "page": vm.pagination.page
+                    },
+                    "id": 1
+                },
+                {
+                    "jsonrpc": "2.0",
+                    "method": "pages.count",
+                    "params": {},
+                    "id": 1
+                }
+            ]
+        ).then(
+            function(response) {
+                if ('result' in response.data[0]) {
+                    vm.pages = response.data[0]['result'];
+                }
+                if ('result' in response.data[1]) {
+                    vm.pagination.size = response.data[1]['result'];
+                }
+            }
+        );
+    },
+    computed: {
+        firstAlpha: function() {
+            /* Получить первый символ */
+            let vm = this;
+            let result = null;
+            if (vm.pages.length>0) {
+                result = vm.pages[0].title.charAt(0);
+            }
+            return result;
+        },
+        lastAlpha: function() {
+            /* Получить последний символ */
+            let vm = this;
+            let result = null;
+            if (vm.pages.length>0) {
+                let title = vm.pages[vm.pages.length-1].title;
+                result = title.charAt(0);
+            }
+            return result;
+        }
+    }
+})
+</script>
+{% endblock %}

myapp/ns_page/templates/user/page.html

@@ -0,0 +1,90 @@
+{% extends "user/skeleton.html" %}
+{% block content %}
+{% raw %}
+
+<h3>
+<a class="btn btn-outline-secondary" href="/pages"><i class="fa fa-chevron-left"></i></a>
+{{ page.title }}
+</h3>
+
+<tags-component v-bind:tags="page.tags" v-bind:node="page.id" v-bind:url="'Page'"></tags-component>
+
+<span v-html="page.body"></span>
+
+<backtotop-component></backtotop-component>
+
+{% endraw %}
+{% endblock %}
+
+{% block breadcrumb %}
+{% raw %}
+<ol class="breadcrumb mt-3">
+    <li class="breadcrumb-item"><a href="/"><i class="fa fa-home"></i></a></li>
+    <li class="breadcrumb-item"><a href="/pages">Страницы</a></li>
+    <li class="breadcrumb-item active" v-html="page.title"></li>
+</ol>
+{% endraw %}
+{% endblock %}
+
+{% block script %}
+<script type="text/javascript" src="/static/components/backtotop.js"></script>
+<link rel="stylesheet" href="/static/components/backtotop.css"></link>
+<script type="text/javascript" src="/static/components/tags.js"></script>
+
+<script type="text/javascript">
+var app = new Vue({
+    el: '#app',
+    data: {
+        page: {{ pagedata['page']|tojson|safe }},
+    },
+    methods: {
+        pageDelete: function() {
+            /* Удалить статью в корзину */
+            let vm = this;
+            axios.post(
+                '/api',
+                {
+                    "jsonrpc": "2.0",
+                    "method": 'page.delete',
+                    "params": {
+                        "id": vm.page.id
+                    },
+                    "id": 1
+                }
+            ).then(
+                function(response) {
+                    if ('result' in response.data) {
+                        window.location.href = '/pages';
+                    }
+                }
+            );
+        },
+        showPanel: function(panel) {
+            /* Показать/скрыть панель */
+            panel.visible = !panel.visible;
+        },
+        saveStatus: function() {
+            let vm = this;
+            axios.post(
+                '/api',
+                {
+                    "jsonrpc": "2.0",
+                    "method": 'page.status',
+                    "params": {
+                        "id": vm.page.id,
+                        "status": vm.page.status
+                    },
+                    "id": 1
+                }
+            ).then(
+                function(response) {
+                    if ('result' in response.data) {
+                        vm.page = response.data['result'];
+                    }
+                }
+            );
+        }
+    }
+})
+</script>
+{% endblock %}

myapp/ns_page/templates/user/page_add.html

@@ -0,0 +1,82 @@
+{% extends "user/skeleton.html" %}
+{% block content %}
+
+
+<h3>
+<a class="btn btn-outline-secondary" href="/pages"><i class="fa fa-chevron-left"></i></a>
+Новая страница
+</h3>
+<hr />
+
+<div class="form-group">
+<label class="control-label" for="title">Заголовок</label>
+<input class="form-control" id="title" name="title" type="text" v-model="page.title">
+</div>
+
+<div class="form-group">
+<label class="control-label" for="body">Текст</label>
+<textarea class="form-control" cols="40" id="body" name="body" rows="8" v-model="page.body"></textarea>
+</div>
+
+<div class="row mt-3">
+<div class="col">
+<button type="button" class="btn btn-outline-success pull-right" v-on:click="send"><i class="fa fa-plus"></i> Добавить</button>
+</div>
+</div>
+
+{% endblock %}
+
+{% block breadcrumb %}
+{% raw %}
+<ol class="breadcrumb mt-3">
+    <li class="breadcrumb-item"><a href="/"><i class="fa fa-home"></i></a></li>
+    <li class="breadcrumb-item"><a href="/pages">Статьи</a></li>
+    <li class="breadcrumb-item active">Новая статья</li>
+</ol>
+{% endraw %}
+{% endblock %}
+
+{% block script %}
+{% import 'inc/editor.js' as editor %}
+{{ editor.plugin('tinymce') }}
+
+<script type="text/javascript">
+var app = new Vue({
+    el: '#app',
+    data: {
+        page: {
+            title: '',
+            body: ''
+        }
+    },
+    methods: {
+        send: function () {
+            /* Сохранить */
+            let vm = this;
+{{ editor.getValue('body', 'vm.page.body', type='tinymce') }}
+            axios.post(
+                '/api',
+                {
+                    "jsonrpc": "2.0",
+                    "method": "page.add",
+                    "params": {
+                        "title": vm.page.title,
+                        "body": vm.page.body
+                    },
+                    "id": 1
+                }
+            ).then(
+                function(response) {
+                    if ('result' in response.data) {
+                        window.location.href = '/page/' + response.data['result'].id;
+                    }
+                }
+            );
+        }
+    },
+    mounted: function () {
+{{ editor.tinymce('body') }}
+    }
+})
+</script>
+{% endblock %}

myapp/ns_page/templates/user/page_edit.html

@@ -0,0 +1,83 @@
+{% extends "user/skeleton.html" %}
+{% block content %}
+
+<h3>
+<a class="btn btn-outline-secondary" :href="'/page/' + page.id"><i class="fa fa-chevron-left"></i></a>
+Редактирование страницы
+</h3>
+<hr />
+
+<div class="form-group">
+<label class="control-label" for="title">Заголовок</label>
+<input class="form-control" id="title" name="title" type="text" v-model="page.title">
+</div>
+
+<div class="form-group">
+<label class="control-label" for="body">Текст</label>
+<textarea class="form-control" cols="40" id="body" name="body" v-model="page.body" rows="8"></textarea>
+</div>
+
+<div class="row mt-3">
+<div class="col">
+<button type="button" class="btn btn-outline-success pull-right" v-on:click="send"><i class="fa fa-save-o"></i> Сохранить</button>
+</div>
+</div>
+
+
+{% endblock %}
+
+{% block breadcrumb %}
+<ol class="breadcrumb mt-3">
+    <li class="breadcrumb-item"><a href="/"><i class="fa fa-home"></i></a></li>
+    <li class="breadcrumb-item"><a href="/pages">Страницы</a></li>
+    <li class="breadcrumb-item"><a href="/page/{{ pagedata['page'].id }}">{{ pagedata['page'].title }}</a></li>
+    <li class="breadcrumb-item active">Редактирование страницы</li>
+</ol>
+{% endblock %}
+
+{% block script %}
+<script type="text/javascript" src="/static/tinymce/tinymce.min.js"></script>
+
+<script type="text/javascript">
+var app = new Vue({
+    el: '#app',
+    data: {
+        page: {{ pagedata['page']|tojson|safe }}
+    },
+    methods: {
+        send: function () {
+            /* Сохранить */
+            let vm = this;
+            var value = CKEDITOR.instances["body"].getData();
+            if (value != vm.page.body) {
+                vm.page.body = value;
+            }
+            axios.post(
+                '/api',
+                {
+                    "jsonrpc": "2.0",
+                    "method": "page.update",
+                    "params": {
+                        "id": vm.page.id,
+                        "title": vm.page.title,
+                        "body": vm.page.body
+                    },
+                    "id": 1
+                }
+            ).then(
+                function(response) {
+                    if ('result' in response.data) {
+                        window.location.href = '/page/' + response.data['result'].id;
+                    }
+                }
+            );
+        }
+    },
+    mounted: function () {
+        CKEDITOR.replace( 'body', {
+            customConfig: '/static/js/ckeditor-conf.js'
+        } );
+    }
+})
+</script>
+{% endblock %}

myapp/ns_page/templates/user/pages.html

@@ -0,0 +1,141 @@
+{% extends "user/skeleton.html" %}
+{% block content %}
+{% raw %}
+
+<h3>
+<div class="float-right">
+<a class="btn btn-outline-success" href="/page/add"><i class="fa fa-plus"></i></a>
+</div>
+
+Статьи
+</h3>
+<hr />
+
+<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
+
+<div class="row" v-if="firstAlpha">
+<div class="col py-2 text-center">
+от <span class="text-danger" v-html="firstAlpha"></span> до <span class="text-danger" v-html="lastAlpha"></span>
+</div>
+</div>
+
+<div class="row" v-for="(page, pageIdx) in pages">
+<div class="col py-2" :class="{'bg-light': pageIdx % 2}">
+<a :href="'/page/' + page.id">{{ page.title }}</a>
+
+<div class="row">
+<div class="col small text-muted">
+<span v-for="(tag, tagIdx) in page.tags">
+<i class="fa fa-tag"></i> <a class="text-monospace" :href="'/tag/' + tag.id">{{ tag.name }}</a>&nbsp;
+</span>
+</div>
+</div>
+
+<div class="row">
+<div class="col small text-muted">
+<i class="fa fa-user"></i> <a :href="'/user/' + page.user.id">{{ page.user.name }}</a>&nbsp;
+Создано: {{ page.created }}&nbsp;
+Обновлено: {{ page.updated }}
+</div>
+</div>
+
+</div>
+</div>
+
+<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
+
+<backtotop-component></backtotop-component>
+
+{% endraw %}
+{% endblock %}
+
+{% block script %}
+<script type="text/javascript" src="/static/components/backtotop.js"></script>
+<link rel="stylesheet" href="/static/components/backtotop.css"></link>
+<script type="text/javascript" src="/static/components/pagination.js"></script>
+
+<script>
+var app = new Vue({
+    el: '#app',
+    data: {
+        pages: [],
+        pagination: {{ pagedata['pagination']|tojson|safe }},
+    },
+    methods: {
+        getPages: function() {
+            /* Получить список статей */
+            let vm = this;
+            axios.post(
+                '/api',
+                {
+                    "jsonrpc": "2.0",
+                    "method": "pages",
+                    "params": {
+                        "page": vm.pagination.page
+                    },
+                    "id": 1
+                }
+            ).then(
+                function(response) {
+                    if ('result' in response.data) {
+                        vm.pages = response.data['result'];
+                    }
+                }
+            );
+        },
+    },
+    created: function() {
+        let vm = this;
+        axios.post(
+            '/api',
+            [
+                {
+                    "jsonrpc": "2.0",
+                    "method": "pages",
+                    "params": {
+                        "page": vm.pagination.page
+                    },
+                    "id": 1
+                },
+                {
+                    "jsonrpc": "2.0",
+                    "method": "pages.count",
+                    "params": {},
+                    "id": 1
+                }
+            ]
+        ).then(
+            function(response) {
+                if ('result' in response.data[0]) {
+                    vm.pages = response.data[0]['result'];
+                }
+                if ('result' in response.data[1]) {
+                    vm.pagination.size = response.data[1]['result'];
+                }
+            }
+        );
+    },
+    computed: {
+        firstAlpha: function() {
+            /* Получить первый символ */
+            let vm = this;
+            let result = null;
+            if (vm.pages.length>0) {
+                result = vm.pages[0].title.charAt(0);
+            }
+            return result;
+        },
+        lastAlpha: function() {
+            /* Получить последний символ */
+            let vm = this;
+            let result = null;
+            if (vm.pages.length>0) {
+                let title = vm.pages[vm.pages.length-1].title;
+                result = title.charAt(0);
+            }
+            return result;
+        }
+    }
+})
+</script>
+{% endblock %}

myapp/ns_page/views_guest.py

@@ -0,0 +1,52 @@
+__author__ = 'RemiZOffAlex'
+__email__ = 'remizoffalex@mail.ru'
+__url__ = 'https://remizoffalex.ru/'
+
+from flask import (
+    abort,
+    render_template
+)
+
+from .. import app, lib, models
+
+
+def pages(page):
+    """Список статей"""
+    pagedata = {'title': 'Статьи - ' + app.config['TITLE']}
+
+    pagedata['pagination'] = {
+        "page": page,
+        "per_page": app.config['ITEMS_ON_PAGE'],
+        "size": 0
+    }
+
+    body = render_template('guest/pages.html', pagedata=pagedata)
+    return body
+
+
+def page_id(id):
+    """
+    Документ
+    """
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        abort(404)
+
+    pagedata = {}
+    pagedata['title'] = '{} - {}'.format(
+        page.title,
+        app.config['TITLE']
+    )
+
+    pagedata['page'] = page.as_dict()
+    pagedata['page']['user'] = page.user.as_dict()
+    pagedata['page']['tags'] = []
+    for tagLink in page.tags:
+        pagedata['page']['tags'].append(tagLink.tag.as_dict())
+
+    body = render_template('guest/page.html', pagedata=pagedata)
+    return body

myapp/ns_page/views_user.py

@@ -0,0 +1,109 @@
+__author__ = 'RemiZOffAlex'
+__email__ = 'remizoffalex@mail.ru'
+__url__ = 'https://remizoffalex.ru/'
+
+import datetime
+
+from flask import (
+    abort,
+    render_template,
+    request,
+    redirect,
+    escape,
+    session
+)
+
+from .. import app, lib, models
+
+
+def pages(page):
+    """
+    Список статей
+    """
+    pagedata = {'title': 'Статьи - ' + app.config['TITLE']}
+
+    pagedata['pagination'] = {
+        "page": page,
+        "per_page": app.config['ITEMS_ON_PAGE'],
+        "size": 0
+    }
+
+    body = render_template('user/pages.html', pagedata=pagedata)
+    return body
+
+
+def page_id(id):
+    """
+    Статья
+    """
+    pagedata = {}
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        abort(404)
+    pagedata['page'] = page.as_dict()
+    pagedata['page']['user'] = page.user.as_dict()
+
+    # Теги
+    pagedata['page']['tags'] = []
+    for tagLink in page.tags:
+        pagedata['page']['tags'].append(tagLink.tag.as_dict())
+
+    pagedata['title'] = '{} - {}'.format(
+        page.title,
+        app.config['TITLE']
+    )
+    body = render_template('user/page.html', pagedata=pagedata)
+    return body
+
+
+def page_id(id):
+    """Документ"""
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        abort(404)
+
+    pagedata = {}
+    pagedata['title'] = '{} - {}'.format(page.title, app.config['TITLE'])
+
+    pagedata['page'] = page.as_dict()
+    pagedata['page']['user'] = page.user.as_dict()
+    pagedata['page']['tags'] = []
+    for tagLink in page.tags:
+        pagedata['page']['tags'].append(tagLink.tag.as_dict())
+
+    body = render_template('user/page.html', pagedata=pagedata)
+    return body
+
+
+def page_edit(id):
+    """
+    Редактирование статьи
+    """
+    pagedata = {'title': app.config['TITLE']}
+    page = models.db_session.query(
+        models.Page
+    ).filter(
+        models.Page.id==id
+    ).first()
+    if page is None:
+        abort(404)
+    pagedata['title'] = '{} - {}'.format(page.title, pagedata['title'])
+    pagedata['page'] = page.as_dict()
+    body = render_template('user/page_edit.html', pagedata=pagedata)
+    return body
+
+
+def page_add():
+    """Добавление нового документа"""
+    pagedata = {}
+    pagedata['title'] = 'Новый документ - ' + app.config['TITLE']
+    body = render_template('user/page_add.html', pagedata=pagedata)
+    return body

myapp/views.py

@@ -19,19 +19,6 @@ def index():
     return body
 
 
-@app.route('/page')
-def page():
-    pagedata = {}
-    pagedata['title'] = app.config['TITLE']
-    pagedata['page'] = {
-        'title': 'Заголовок страницы',
-        'text': '''<p>Текст</p>
-<p class="alert alert-danger">Внимание!</p>'''
-    }
-    body = render_template('page.html', pagedata=pagedata)
-    return body
-
-
 @app.route("/robots.txt")
 def robots_txt():
     body = render_template("robots.txt")