Мусор

This commit is contained in:
2024-10-25 23:09:39 +03:00
parent 126cde490b
commit 2c6d0ac34f
45 changed files with 18 additions and 2230 deletions

View File

@@ -0,0 +1,13 @@
bind = "0.0.0.0:5000"
reload = True
preload = True
workers = 4
timeout = 120
errorlog = '-'
accesslog = '-'
# wsgi_app = 'myapp.factory:create_app()'
wsgi_app = 'myapp:app'
loglevel = 'debug'
raw_env = [
"MYAPP_CONFIG=config.default"
]

View File

@@ -53,22 +53,4 @@ from . import ns_api # noqa F401
# Общее
from . import ns_common # noqa F401
# Авторизация
from . import ns_login # noqa F401
# Заметки
from . import ns_note # noqa F401
# Статьи
from . import ns_page # noqa F401
# Профиль
from . import ns_profile # noqa F401
# Метки
from . import ns_tag # noqa F401
# Пользователи
from . import ns_user # noqa F401
from . import views # noqa F401

View File

@@ -7,14 +7,15 @@ from flask import render_template
from .. import app, lib
@app.route('/')
def index():
@app.route('/', defaults = {'path': ''})
@app.route('/<path:path>')
def index(path):
pagedata = {}
pagedata['title'] = app.config['TITLE']
if lib.get_user():
pagedata['info'] = 'Закрытый раздел'
body = render_template('user/index.html', pagedata=pagedata)
body = render_template('private/skeleton.html', pagedata=pagedata)
else:
pagedata['info'] = 'Открытый раздел'
body = render_template('guest/index.html', pagedata=pagedata)
body = render_template('public/skeleton.html', pagedata=pagedata)
return body

View File

@@ -1,18 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
import os
import jinja2
from . import views # noqa F401
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

View File

@@ -1,74 +0,0 @@
{% extends "skeleton.html" %}
{% block content %}
<div class="row">
<div class="col-md-6 ml-auto mr-auto">
<h3>Вход</h3>
<hr />
<div class="alert alert-danger" v-if="error">{{ error }}</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-user"></i></span>
</div>
<input class="form-control" placeholder="Логин" type="text" id="username" v-model="username">
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lock"></i></span>
</div>
<input class="form-control" placeholder="Пароль" type="password" id="password" v-model="password">
</div>
</div>
<div class="row">
<div class="col">
<a class="btn btn-outline-secondary" href="/register">Регистрация</a>
<button class="btn btn-outline-success float-right" type="submit" v-on:click="login">Войти</button>
</div>
</div>
</div>
</div>
{% endblock %}
{% block script %}
<script type="text/javascript">
Object.assign(root.data, {
username: '',
password: '',
error: null
});
Object.assign(root.methods, {
login: function() {
let vm = this;
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "login",
"params": {
"username": vm.username,
"password": vm.password
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
window.location.href = '/';
} else if ('error' in response.data) {
vm.error = response.data['error'].message;
}
}
);
}
});
</script>
{% endblock %}

View File

@@ -1,90 +0,0 @@
{% extends "skeleton.html" %}
{% block content %}
<div class="row">
<div class="col-md-6 ml-md-auto mr-md-auto">
<h3>Регистрация</h3>
<hr />
<div class="row mt-3" v-if="error">
<div class="col text-danger" v-html="error.message"></div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<i class="input-group-text"><i class="fa fa-user"></i></i>
</div>
<input class="form-control" placeholder="Логин" type="text" id="username" v-model="username">
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<i class="input-group-text"><i class="fa fa-lock"></i></i>
</div>
<input class="form-control" placeholder="Пароль" type="password" id="password" v-model="password">
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<i class="input-group-text"><i class="fa fa-lock"></i></i>
</div>
<input class="form-control" placeholder="Повтор пароля" type="password" id="repeat" v-model="repeat">
</div>
</div>
<div class="btn btn-outline-success float-right" v-on:click="register">Зарегистрироваться</div>
<a class="btn btn-outline-secondary" href="/login">Вход</a>
</div> <!-- div class="col-md-6 ml-md-auto mr-md-auto" -->
</div> <!-- div class="row" -->
{% endblock %}
{% block script %}
<script type="text/javascript">
var app = new Vue({
el: '#app',
data: {
username: '',
password: '',
repeat: '',
error: null
},
methods: {
register: function() {
let vm = this;
if (vm.password!=vm.repeat) {
vm.error = 'Пароли не совпадают';
return;
}
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "login.register",
"params": {
"username": vm.username,
"password": vm.password
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
window.location.href = '/login';
} else if ('error' in response.data) {
vm.error = response.data['error'];
}
}
);
}
}
})
</script>
{% endblock %}

View File

@@ -1,34 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import render_template, session, redirect
from .. import app
@app.route('/login')
def login():
"""Вход
"""
pagedata = {}
body = render_template('login.html', pagedata=pagedata)
return body
@app.route('/logout')
def logout():
"""Выход
"""
session.pop('logged_in', None)
session.pop('user_id', None)
return redirect("/", code=302)
@app.route('/register')
def register():
"""Регистрация нового пользователя
"""
pagedata = {}
body = render_template('register.html', pagedata=pagedata)
return body

View File

@@ -1,18 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
import os
import jinja2
from . import views # noqa F401
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

View File

@@ -1,63 +0,0 @@
{% extends "private/skeleton.html" %}
{% block content %}
{% raw %}
<h3>
<a class="btn btn-outline-secondary" href="/notes"><i class="fa fa-chevron-left"></i></a>
{{ note.title }}
</h3>
<tags-component v-bind:tags="note.tags" v-bind:resource="{id: note.id, name: 'note'}"></tags-component>
<span v-html="note.body"></span>
{% 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="/notes">Заметки</a></li>
<li class="breadcrumb-item active" v-html="note.title"></li>
</ol>
{% endraw %}
{% endblock %}
{% block script %}
<script type="text/javascript">
var app = new Vue({
el: '#app',
data: {
note: {{ pagedata['note']|tojson|safe }},
},
methods: {
noteDelete: function() {
/* Удалить статью в корзину */
let vm = this;
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": 'note.delete',
"params": {
"id": vm.note.id
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
window.location.href = '/notes';
}
}
);
},
panel_show: function(panel) {
/* Показать/скрыть панель */
panel.visible = !panel.visible;
},
}
})
</script>
{% endblock %}

View File

@@ -1,79 +0,0 @@
{% extends "private/skeleton.html" %}
{% block content %}
<h3>
<a class="btn btn-outline-secondary" href="/notes"><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="note.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="note.body"></textarea>
</div>
<div class="row mt-3">
<div class="col">
<button type="submit" 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="/notes">Заметки</a></li>
<li class="breadcrumb-item active">Новая заметка</li>
</ol>
{% endraw %}
{% endblock %}
{% block script %}
<script type="text/javascript">
var app = new Vue({
el: '#app',
data: {
note: {
title: '',
body: ''
}
},
methods: {
send: function () {
/* Сохранить */
let vm = this;
{{ editor.getValue('"body"', 'vm.note.body', type='tinymce') }}
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "note.add",
"params": {
"title": vm.note.title,
"body": vm.note.body
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
window.location.href = '/note/' + response.data['result'].id;
}
}
);
}
},
mounted: function () {
{{ editor.tinymce('"body"') }}
}
})
</script>
{% endblock %}

View File

@@ -1,78 +0,0 @@
{% extends "private/skeleton.html" %}
{% block content %}
<h3>
<a class="btn btn-outline-secondary" :href="'/note/' + note.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="note.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="note.body" rows="8"></textarea>
</div>
<div class="row mt-3">
<div class="col">
<button type="submit" class="btn btn-outline-success pull-right" v-on:click="send"><i class="fa fa-save-o"></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="/notes">Заметки</a></li>
<li class="breadcrumb-item"><a :href="'/note/' + note.id" v-html="note.title"></a></li>
<li class="breadcrumb-item active">Редактирование заметки</li>
</ol>
{% endraw %}
{% endblock %}
{% block script %}
<script type="text/javascript">
var app = new Vue({
el: '#app',
data: {
note: {{ pagedata['note']|tojson|safe }}
},
methods: {
send: function () {
/* Сохранить */
let vm = this;
{{ editor.getValue('"body"', 'vm.note.body', type='tinymce') }}
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "note.update",
"params": {
"id": vm.note.id,
"title": vm.note.title,
"body": vm.note.body
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
window.location.href = '/note/' + response.data['result'].id;
}
}
);
}
},
mounted: function () {
{{ editor.tinymce('"body"') }}
}
})
</script>
{% endblock %}

View File

@@ -1,112 +0,0 @@
{% extends "private/skeleton.html" %}
{% block content %}
<h3>
<div class="float-right">
<a class="btn btn-outline-success" href="/note/add"><i class="fa fa-plus"></i></a>
</div>
<button type="button" class="btn btn-outline-secondary" v-on:click="panel_show(panels.filter)"><i class="fa fa-filter"></i></button>
Заметки
</h3>
<hr />
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getNotes"></pagination-component>
{% include 'inc/notes.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getNotes"></pagination-component>
{% endblock %}
{% block script %}
<script type="text/javascript" src="/static/components/pagination.js"></script>
<script>
Object.assign(root.data, {
raw_notes: [],
pagination: {{ pagedata['pagination']|tojson|safe }},
});
Object.assign(root.data.panels, {
order_by: {
visible: false,
field: 'title',
order: 'asc'
},
});
Object.assign(root.methods, {
filterApply: function() {},
filterNote: function(note) {
let vm = this;
let value = vm.panels.filter.value;
if ( value.length<1 ) {
return true;
}
if ( note.title.toLowerCase().includes(value.toLowerCase()) ) {
return true;
}
return false;
},
getNotes: function() {
/* Получить список заметок */
let vm = this;
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "notes",
"params": {
"page": vm.pagination.page
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
vm.raw_notes = response.data['result'];
}
}
);
},
});
root.created = function() {
let vm = this;
axios.post(
'/api',
[
{
"jsonrpc": "2.0",
"method": "notes",
"params": {
"page": vm.pagination.page
},
"id": 1
},
{
"jsonrpc": "2.0",
"method": "notes.count",
"params": {},
"id": 1
}
]
).then(
function(response) {
if ('result' in response.data[0]) {
vm.raw_notes = response.data[0]['result'];
}
if ('result' in response.data[1]) {
vm.pagination.size = response.data[1]['result'];
}
}
);
};
Object.assign(root.computed, {
notes: function() {
/* Отфильтрованный список */
let vm = this;
var result = vm.raw_notes.filter(vm.filterNote);
return result;
},
});
</script>
{% endblock %}

View File

@@ -1,58 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, models
@app.route('/note/<int:id>')
def note_id(id):
"""Заметка"""
note = models.db_session.query(
models.Note
).filter(
models.Note.id == id
).first()
if note is None:
abort(404)
pagedata = {}
pagedata['title'] = '{} - {}'.format(note.title, app.config['TITLE'])
pagedata['note'] = note.as_dict()
pagedata['note']['user'] = note.user.as_dict()
pagedata['note']['tags'] = []
for tagLink in note.tags:
pagedata['note']['tags'].append(tagLink.tag.as_dict())
body = render_template('note.html', pagedata=pagedata)
return body
@app.route('/note/add')
def note_add():
"""Добавление новой заметки
"""
pagedata = {}
pagedata['title'] = 'Новая заметка - ' + app.config['TITLE']
body = render_template('note_add.html', pagedata=pagedata)
return body
@app.route('/notes', defaults={'page': 1})
@app.route('/notes/<int:page>')
def notes_list(page):
"""Список заметок
"""
pagedata = {}
pagedata['pagination'] = {
"page": page,
"per_page": app.config['ITEMS_ON_PAGE'],
"size": 0
}
body = render_template('notes.html', pagedata=pagedata)
return body

View File

@@ -1,18 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
import os
import jinja2
from . import routes # noqa F401
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

View File

@@ -1,45 +0,0 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort
from . import views_user, views_guest
from .. import app, lib
@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)

View File

@@ -1,24 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<a href="/pages">Назад</a>
<h1>{{ pagedata['page'].title }}</h1>
<hr />
<p>
{% for tagLink in pagedata['page'].tags %}
<a href="/tag/{{ tagLink.tag.id }}">{{ tagLink.tag.name }}</a>;
{% endfor %}
</p>
{{ pagedata['page'].body|safe }}
{% endblock %}
{% block breadcrumb %}
<ul>
<li><a href="/">Домой</a></li>
<li><a href="/pages">Список статей</a></li>
<li>{{ pagedata['page'].title }}</li>
</ul>
{% endblock %}

View File

@@ -1,124 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<h3>Статьи</h3>
<hr />
<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>
{% include '/inc/pages.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
{% endblock %}
{% block script %}
<script type="text/javascript" src="/static/components/pagination.js"></script>
<script>
Object.assign(root.data, {
raw_pages: [],
pagination: {{ pagedata['pagination']|tojson|safe }},
});
Object.assign(root.methods, {
filterApply: function() {},
filterPage: function(page) {
let vm = this;
let value = vm.panels.filter.value;
if ( value.length<1 ) {
return true;
}
if ( page.title.toLowerCase().includes(value.toLowerCase()) ) {
return true;
}
return false;
},
getPages: function() {
/* Получить список статей */
let vm = this;
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "pages",
"params": {
"page": vm.pagination.page,
"order_by": vm.panels.order_by
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
vm.raw_pages = response.data['result'];
}
}
);
},
});
root.created = function() {
let vm = this;
axios.post(
'/api',
[
{
"jsonrpc": "2.0",
"method": "pages",
"params": {
"page": vm.pagination.page,
"order_by": vm.panels.order_by
},
"id": 1
},
{
"jsonrpc": "2.0",
"method": "pages.count",
"params": {},
"id": 1
}
]
).then(
function(response) {
if ('result' in response.data[0]) {
vm.raw_pages = response.data[0]['result'];
}
if ('result' in response.data[1]) {
vm.pagination.size = response.data[1]['result'];
}
}
);
};
Object.assign(root.computed, {
pages: function() {
/* Отфильтрованный список */
let vm = this;
var result = vm.raw_pages.filter(vm.filterPage);
return result;
},
firstAlpha: function() {
/* Получить первый символ */
let vm = this;
let result = null;
if (vm.raw_pages.length>0) {
result = vm.raw_pages[0].title.charAt(0);
}
return result;
},
lastAlpha: function() {
/* Получить последний символ */
let vm = this;
let result = null;
if (vm.raw_pages.length>0) {
let title = vm.raw_pages[vm.raw_pages.length-1].title;
result = title.charAt(0);
}
return result;
},
});
</script>
{% endblock %}

View File

@@ -1,79 +0,0 @@
{% extends "/private/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:resource="{id: page.id, name: 'page'}"></tags-component>
<span v-html="page.body"></span>
{% 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/tags.js"></script>
<script type="text/javascript">
Object.assign(root.data, {
page: {{ pagedata['page']|tojson|safe }},
});
Object.assign(root.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';
}
}
);
},
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 %}

View File

@@ -1,78 +0,0 @@
{% extends "/private/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="submit" class="btn btn-outline-success pull-right" v-on:click="send"><i class="fa fa-save-o"></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"><a :href="'/page/' + page.id">{{ page.title }}</a></li>
<li class="breadcrumb-item active">Редактирование страницы</li>
</ol>
{% endraw %}
{% endblock %}
{% block script %}
<script type="text/javascript">
var app = new Vue({
el: '#app',
data: {
page: {{ pagedata['page']|tojson|safe }}
},
methods: {
send: function () {
/* Сохранить */
let vm = this;
{{ editor.getValue('"body"', 'vm.page.body', type='tinymce') }}
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 () {
{{ editor.tinymce('"body"') }}
}
})
</script>
{% endblock %}

View File

@@ -1,152 +0,0 @@
{% extends "/private/skeleton.html" %}
{% block content %}
<h3>
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary" v-on:click="panel_show(panels.filter)"><i class="fa fa-filter"></i></button>
<button type="button" class="btn btn-outline-secondary" v-on:click="panel_show(panels.order_by)"><i class="fa fa-sort-alpha-asc"></i></button>
</div>
<div class="float-right">
<a class="btn btn-outline-success" href="/page/add"><i class="fa fa-plus"></i></a>
</div>
Статьи
</h3>
<hr />
<!-- Начало: Панель сортировки -->
<div class="row" v-if="panels.order_by.visible">
<div class="col py-2">
<div class="input-group">
<button type="button" class="btn btn-outline-secondary" v-if="panels.order_by.order==='asc'" v-on:click="panels.order_by.order = 'desc'; getBriefcases();"><i class="fa fa-sort-alpha-asc"></i></button>
<button type="button" class="btn btn-outline-secondary" v-else v-on:click="panels.order_by.order = 'asc'; getBriefcases();"><i class="fa fa-sort-alpha-desc"></i></button>
<select class="form-select" v-model="panels.order_by.field" v-on:change="getBriefcases();">
<option value="id">ID</option>
<option value="title">заголовку</option>
<option value="created">дате создания</option>
<option value="updated">дате обновления</option>
</select>
</div>
</div>
</div>
<!-- Конец: Панель сортировки -->
{% include 'pagination-curl.html' %}
{% include 'inc/pages.html' %}
{% include 'pagination-curl.html' %}
{% endblock %}
{% block script %}
<script>
Object.assign(root.data, {
raw_pages: [],
pagination: {{ pagedata['pagination']|tojson|safe }},
});
Object.assign(root.data.panels, {
order_by: {
visible: false,
field: 'title',
order: 'asc'
},
});
Object.assign(root.methods, {
filterApply: function() {},
filterPage: function(page) {
let vm = this;
let value = vm.panels.filter.value;
if ( value.length<1 ) {
return true;
}
if ( page.title.toLowerCase().includes(value.toLowerCase()) ) {
return true;
}
return false;
},
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.raw_pages = response.data['result'];
}
}
);
},
});
root.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.raw_pages = response.data[0]['result'];
}
if ('result' in response.data[1]) {
vm.pagination.size = response.data[1]['result'];
}
}
);
};
Object.assign(root.computed, {
pages: function() {
/* Отфильтрованный список */
let vm = this;
var result = vm.raw_pages.filter(vm.filterPage);
return result;
},
firstAlpha: function() {
/* Получить первый символ */
let vm = this;
let result = null;
if (vm.raw_pages.length>0) {
result = vm.raw_pages[0].title.charAt(0);
}
return result;
},
lastAlpha: function() {
/* Получить последний символ */
let vm = this;
let result = null;
if (vm.raw_pages.length>0) {
let title = vm.raw_pages[vm.raw_pages.length-1].title;
result = title.charAt(0);
}
return result;
}
});
</script>
{% endblock %}

View File

@@ -1,49 +0,0 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, models
def pages(page):
"""Список статей
"""
pagedata = {'title': 'Статьи - ' + app.config['TITLE']}
pages = models.db_session.query(
models.Page
).all()
pagedata['pages'] = pages
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
body = render_template('guest/page.html', pagedata=pagedata)
return body

View File

@@ -1,77 +0,0 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, 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):
"""Статья
"""
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())
pagedata['title'] = '{} - {}'.format(
page.title,
app.config['TITLE']
)
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('/private/skeleton.html', pagedata=pagedata)
return body

View File

@@ -1,18 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
import os
import jinja2
from . import views # noqa F401
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

View File

@@ -1,11 +0,0 @@
{% extends "/private/skeleton.html" %}
{% block content %}
<h3>Профиль</h3>
<hr />
{% include 'profile_menu.html' %}
<p>Зарегистрирован: {{ user.created }}</p>
{% endblock content %}

View File

@@ -1,17 +0,0 @@
<div class="row">
<div class="col">
<div class="btn-group">
<div class="btn btn-outline-secondary disabled mb-2" v-if="menuitem===null"><i class="fa fa-bars"></i></div>
<a class="btn btn-outline-secondary mb-2" href="/profile" v-else><i class="fa fa-bars"></i></a>
</div>
<a class="btn btn-outline-secondary mb-2" href="/profile/favorite">Избранное</a>
<a class="btn btn-outline-secondary mb-2" href="/profile/passwd">Сменить пароль</a>
<a class="btn btn-outline-secondary mb-2" href="/profile/pages">Ваши документы</a>
<a class="btn btn-outline-secondary mb-2" href="/notes">Ваши заметки</a>
</div>
</div>
<hr />

View File

@@ -1,99 +0,0 @@
{% extends "skeleton.html" %}
{% block content %}
<h3>Профиль</h3>
<hr />
{% include 'profile_menu.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
{% include 'inc/pages.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
{% endblock content %}
{% block script %}
<script type="text/javascript" src="/static/components/pagination.js"></script>
<script type="text/javascript">
Object.assign(root.data, {
menuitem: 'pages',
raw_pages: [],
pagination: {{ pagedata['pagination']|tojson|safe }},
});
Object.assign(root.methods, {
filterApply: function() {},
filterPage: function(page) {
let vm = this;
if ( vm.filter.length<1 ) {
return true;
}
if ( page.title.toLowerCase().includes(vm.filter.toLowerCase()) ) {
return true;
}
return false;
},
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.raw_pages = response.data['result'];
}
}
);
},
},
created: function() {
let vm = this;
axios.post(
'/api',
[
{
"jsonrpc": "2.0",
"method": "profile.pages",
"params": {
"page": vm.pagination.page
},
"id": 1
},
{
"jsonrpc": "2.0",
"method": "profile.pages.count",
"params": {},
"id": 1
}
]
).then(
function(response) {
if ('result' in response.data[0]) {
vm.raw_pages = response.data[0]['result'];
}
if ('result' in response.data[1]) {
vm.pagination.size = response.data[1]['result'];
}
}
);
},
computed: {
pages: function() {
let vm = this;
return vm.raw_pages;
}
},
})
</script>
{% endblock script %}

View File

@@ -1,39 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import render_template
from .. import app
from ..decorators import login_required
@app.route('/profile')
@login_required
def profile():
"""
Личный профиль пользователя
"""
pagedata = {}
pagedata['title'] = 'Мой профиль - {}'.format(app.config['TITLE'])
body = render_template('profile.html', pagedata=pagedata)
return body
@app.route('/profile/pages')
@login_required
def profile_pages():
"""
Личный профиль пользователя
"""
pagedata = {}
pagedata['title'] = 'Мой профиль - {}'.format(app.config['TITLE'])
pagedata['pagination'] = {
"page": 1,
"per_page": app.config['ITEMS_ON_PAGE'],
"size": 0
}
body = render_template('profile_pages.html', pagedata=pagedata)
return body

View File

@@ -1,18 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
import os
import jinja2
from . import routes # noqa F401
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

View File

@@ -1,37 +0,0 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort
from . import views_user, views_guest
from .. import app, lib
@app.route('/tags')
def tags():
"""Список меток
"""
if lib.get_user():
return views_user.tags()
else:
return views_guest.tags()
@app.route('/tag/<int:id>')
def tag_id(id):
"""Метка
"""
if lib.get_user():
return views_user.tag_id(id)
else:
return views_guest.tag_id(id)
@app.route('/tag/<int:id>/notes')
def tag_notes(id):
"""Заметки с меткой
"""
if lib.get_user():
return views_user.tag_notes(id)
else:
abort(404)

View File

@@ -1,22 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<a href="/tags">Назад</a>
<h1>Тег {{ pagedata['tag'].name }}</h1>
<hr />
{% include 'pagination-curl.html' %}
{% include '/inc/pages.html' %}
{% include 'pagination-curl.html' %}
{% endblock %}
{% block breadcrumb %}
<ul>
<li><a href="/">Домой</a></li>
<li><a href="/tags">Список тегов</a></li>
<li>{{ pagedata['tag'].name }}</li>
</ul>
{% endblock %}

View File

@@ -1,18 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<h1>Список тегов</h1>
<hr />
<p>{% for tag in pagedata['tags'] %}
<a href="/tag/{{ tag.id }}">{{ tag.name }}</a> /
{% endfor %}</p>
{% endblock %}
{% block breadcrumb %}
<ol>
<li><a href="/">Домой</a></li>
<li>Список тегов</li>
</ol>
{% endblock %}

View File

@@ -1,62 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, lib, models
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: int, page: int = 1):
"""Метка
"""
pagedata = {}
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id == id
).first()
if tag is None:
abort(404)
pagedata['title'] = 'Метка {} - {}'.format(
tag.name,
app.config['TITLE']
)
pagedata['tag'] = tag
pages_idx = models.db_session.query(
models.PageTag.page_id
).filter(
models.PageTag.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

View File

@@ -1,58 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, models
def tags():
"""Список меток
"""
pagedata = {}
pagedata['title'] = 'Список меток - ' + app.config['TITLE']
body = render_template('/private/skeleton.html', pagedata=pagedata)
return body
def tag_id(id):
"""Метка
"""
pagedata = {}
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id == id
).first()
if tag is None:
abort(404)
pagedata['title'] = 'Метка {} - {}'.format(
tag.name,
app.config['TITLE']
)
body = render_template('/private/skeleton.html', pagedata=pagedata)
return body
def tag_notes(id):
"""Метка
"""
pagedata = {}
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id == id
).first()
if tag is None:
abort(404)
pagedata['title'] = 'Метка {} - {}'.format(
tag.name,
app.config['TITLE']
)
body = render_template('/private/skeleton.html', pagedata=pagedata)
return body

View File

@@ -1,18 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
import os
import jinja2
from . import routes # noqa F401
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

View File

@@ -1,42 +0,0 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort
from . import views_user, views_guest
from .. import app, lib
@app.route('/user/<int:id>')
def user_id(id):
"""Пользователь
"""
if lib.get_user():
return views_user.user_id(id)
else:
return views_guest.user_id(id)
@app.route('/user/<int:id>/pages', defaults={'page': 1})
@app.route('/user/<int:id>/pages/<int:page>')
def user_pages(id: int, page: int):
"""Список статей пользователя
"""
if lib.get_user():
return views_user.user_pages(id, page)
else:
return views_guest.user_pages(id, page)
abort(404)
@app.route('/users', defaults={'page': 1})
@app.route('/users/<int:page>')
def users_list(page: int):
"""
Список пользователей
"""
if lib.get_user():
return views_user.users_list(page)
else:
return views_guest.users_list(page)
abort(404)

View File

@@ -1,21 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<a href="/users">Назад</a>
<h1>{{ pagedata['user'].name }}</h1>
<hr />
{% include 'guest/user_menu.html' %}
<p>Зарегистрирован: {{ pagedata['user'].created }}
{% endblock %}
{% block breadcrumb %}
<ol>
<li><a href="/">Домой</a></li>
<li><a href="/user">Список пользователей</a></li>
<li>{{ pagedata['user'].name }}</li>
</ol>
{% endblock %}

View File

@@ -1,5 +0,0 @@
<p>
<a href="/user/{{ pagedata['user'].id }}">{{ pagedata['user'].name }}</a> /
<a href="/user/{{ pagedata['user'].id }}/pages">Статьи</a>
</p>
<hr />

View File

@@ -1,24 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<a href="/users">Назад</a>
<h1>{{ pagedata['user'].name }}</h1>
<hr />
{% include 'guest/user_menu.html' %}
{% include 'pagination-curl.html' %}
{% include 'inc/pages.html' %}
{% include 'pagination-curl.html' %}
{% endblock %}
{% block breadcrumb %}
<ol>
<li><a href="/">Домой</a></li>
<li><a href="/user">Список пользователей</a></li>
<li>{{ pagedata['user'].name }}</li>
</ol>
{% endblock %}

View File

@@ -1,20 +0,0 @@
{% extends "/public/skeleton.html" %}
{% block content %}
<h3>Список пользователей</h3>
<hr />
{% include 'pagination-curl.html' %}
{% include '/inc/users.html' %}
{% include 'pagination-curl.html' %}
{% endblock %}
{% block breadcrumb %}
<ul>
<li><a href="/">Домой</a></li>
<li>Список пользователей</li>
</ol>
{% endblock %}

View File

@@ -1,43 +0,0 @@
{% extends "/private/skeleton.html" %}
{% block content %}
{% raw %}
<h3>
<a class="btn btn-outline-secondary" href="/users"><i class="fa fa-chevron-left"></i></a>
{{ user.name }}</h3>
<hr />
{% endraw %}
{% include 'user_menu.html' %}
{% raw %}
Зарегистрирован: {{ user.created }}
{% 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="/user">Список пользователей</a></li>
<li class="breadcrumb-item">{{ user.name }}</li>
</ol>
{% endraw %}
{% endblock %}
{% block script %}
<script type="text/javascript">
var app = new Vue({
el: '#app',
data: {
menuitem: null,
user: {{ pagedata['user']|tojson|safe }},
},
methods: {
},
})
</script>
{% endblock %}

View File

@@ -1,13 +0,0 @@
<div class="row">
<div class="col">
<div class="btn btn-primary mb-2" v-if="menuitem===null"><i class="fa fa-bars"></i></div>
<a class="btn btn-outline-secondary mb-2" :href="'/user/' + user.id" v-else><i class="fa fa-bars"></i></a>
<div class="btn btn-primary mb-2" v-if="menuitem==='pages'">Статьи</div>
<a class="btn btn-outline-secondary mb-2" :href="'/user/' + user.id + '/pages'" v-else>Статьи</a>
</div>
</div>
<hr />

View File

@@ -1,117 +0,0 @@
{% extends "skeleton.html" %}
{% block content %}
{% raw %}
<h3>
<a class="btn btn-outline-secondary" href="/users"><i class="fa fa-chevron-left"></i></a>
{{ user.name }}</h3>
<hr />
{% endraw %}
{% include 'user_menu.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
{% include 'inc/pages.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getPages"></pagination-component>
{% 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="/user">Список пользователей</a></li>
<li class="breadcrumb-item">{{ user.name }}</li>
</ol>
{% endraw %}
{% endblock %}
{% block script %}
<script type="text/javascript">
Object.assign(root.data, {
menuitem: 'pages',
user: {{ pagedata['user']|tojson|safe }},
raw_pages: [],
pagination: {{ pagedata['pagination']|tojson|safe }},
});
Object.assign(root.methods, {
filterApply: function() {},
filterPage: function(page) {
let vm = this;
if ( vm.filter.length<1 ) {
return true;
}
if ( page.title.toLowerCase().includes(vm.filter.toLowerCase()) ) {
return true;
}
return false;
},
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.raw_pages = response.data['result'];
}
}
);
},
});
root.created = function() {
let vm = this;
axios.post(
'/api',
[
{
"jsonrpc": "2.0",
"method": "user.pages",
"params": {
"id": vm.user.id,
"page": vm.pagination.page
},
"id": 1
},
{
"jsonrpc": "2.0",
"method": "user.pages.count",
"params": {
"id": vm.user.id,
},
"id": 1
}
]
).then(
function(response) {
if ('result' in response.data[0]) {
vm.raw_pages = response.data[0]['result'];
}
if ('result' in response.data[1]) {
vm.pagination.size = response.data[1]['result'];
}
}
);
};
computed: {
pages: function() {
/* Отфильтрованный список */
let vm = this;
var result = vm.raw_pages.filter(vm.filterPage);
return result;
},
},
})
</script>
{% endblock %}

View File

@@ -1,90 +0,0 @@
{% extends "/private/skeleton.html" %}
{% block content %}
<h3>Список пользователей</h3>
<hr />
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getUsers"></pagination-component>
{% include '/inc/users.html' %}
<pagination-component v-bind:pagination="pagination" v-bind:click-handler="getUsers"></pagination-component>
{% 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">Список пользователей</li>
</ol>
{% endblock %}
{% block script %}
<script type="text/javascript" src="/static/components/pagination.js"></script>
<script type="text/javascript">
Object.assign(root.data, {
raw_users: [],
pagination: {{ pagedata['pagination']|tojson|safe }},
});
Object.assign(root.methods, {
getUsers: function() {
let vm = this;
axios.post(
'/api',
{
"jsonrpc": "2.0",
"method": "users",
"params": {
"page": vm.pagination.page
},
"id": 1
}
).then(
function(response) {
if ('result' in response.data) {
vm.raw_users = response.data['result'];
}
}
);
}
});
Object.assign(root.computed, {
users: function() {
let vm = this;
return vm.raw_users;
}
});
root.created = function() {
let vm = this;
axios.post(
'/api',
[
{
"jsonrpc": "2.0",
"method": 'users',
"params": {
"page": vm.pagination.page
},
"id": 1
},
{
"jsonrpc": "2.0",
"method": 'users.count',
"params": {},
"id": 1
}
]
).then(
function(response) {
if ('result' in response.data[0]) {
vm.raw_users = response.data[0]['result'];
}
if ('result' in response.data[1]) {
vm.pagination.size = response.data[1]['result'];
}
}
);
};
</script>
{% endblock %}

View File

@@ -1,82 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, lib, models
def user_id(id):
"""Пользователь
"""
pagedata = {}
user = models.db_session.query(
models.User
).filter(
models.User.id == id
).first()
if user is None:
abort(404)
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: int, page: int = 1):
"""Список статей пользователя
"""
user = models.db_session.query(
models.User
).filter(
models.User.id == id
).first()
if user is None:
abort(404)
pagedata = {}
pagedata['user'] = user.as_dict()
pagedata['title'] = '{} - {}'.format(user.name, app.config['TITLE'])
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_list(page: int = 1):
"""Список пользователей
"""
pagedata = {}
pagedata['title'] = 'Список пользователей - ' + app.config['TITLE']
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

View File

@@ -1,64 +0,0 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
from flask import abort, render_template
from .. import app, models
def user_id(id):
"""Пользователь
"""
pagedata = {}
user = models.db_session.query(
models.User
).filter(
models.User.id == id
).first()
if user is None:
abort(404)
pagedata['user'] = user.as_dict()
pagedata['title'] = '{} - {}'.format(user.name, app.config['TITLE'])
body = render_template('user.html', pagedata=pagedata)
return body
def user_pages(id):
"""Список статей пользователя
"""
pagedata = {}
user = models.db_session.query(
models.User
).filter(
models.User.id == id
).first()
if user is None:
abort(404)
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
}
body = render_template('user_pages.html', pagedata=pagedata)
return body
def users_list(page: int):
"""Список пользователей
"""
pagedata = {}
pagedata['title'] = 'Список пользователей - ' + app.config['TITLE']
pagedata['pagination'] = {
"page": page,
"per_page": app.config['ITEMS_ON_PAGE'],
"size": 0
}
body = render_template('users.html', pagedata=pagedata)
return body