-
{{ page.title }}
+
diff --git a/myapp/templates/index.html b/myapp/templates/index.html
index 501c62f..615960b 100644
--- a/myapp/templates/index.html
+++ b/myapp/templates/index.html
@@ -1,12 +1,8 @@
{% extends "skeleton.html" %}
{% block content %}
-
-
-
{{ pagedata['info'] }}
+
{{ pagedata['info'] }}
Самурай без меча подобен самураю с мечом, но только без меча, однако как-будто с мечом, которого у него нет, но и без него он как с ним...
-
-
{% endblock %}
diff --git a/myapp/templates/lib.js b/myapp/templates/lib.js
new file mode 100644
index 0000000..5c91cb4
--- /dev/null
+++ b/myapp/templates/lib.js
@@ -0,0 +1,10 @@
+function arrayRemove(arr, value) {
+ /* Удаление элемента из списка */
+ return arr.filter(function(ele){
+ return ele.id != value.id;
+ });
+};
+function panel_show(panel) {
+ /* Показать/скрыть панель */
+ panel.visible = !panel.visible;
+};
diff --git a/myapp/templates/public/app.js b/myapp/templates/public/app.js
new file mode 100644
index 0000000..bff2e0a
--- /dev/null
+++ b/myapp/templates/public/app.js
@@ -0,0 +1,15 @@
+{% include '/public/settings.js' %}
+
+//let vr = document.body;
+let vroot = document.getElementById("app");
+let routes = {};
+
+{% include '/lib.js' %}
+{% include '/public/layout.js' %}
+
+{% include '/components/inc.j2' %}
+
+{% include '/public/components/inc.j2' %}
+{% include '/public/domains/inc.j2' %}
+
+{% include '/routes.js' %}
diff --git a/myapp/templates/public/components/footer.js b/myapp/templates/public/components/footer.js
new file mode 100644
index 0000000..a52c6d2
--- /dev/null
+++ b/myapp/templates/public/components/footer.js
@@ -0,0 +1,11 @@
+let Footer = {
+ view: function() {
+ return {tag: '<', children: `
`}
+ }
+};
diff --git a/myapp/templates/public/domains/auth/inc.j2 b/myapp/templates/public/domains/auth/inc.j2
new file mode 100644
index 0000000..e92aabb
--- /dev/null
+++ b/myapp/templates/public/domains/auth/inc.j2
@@ -0,0 +1,10 @@
+{% include '/public/domains/auth/login.js' %}
+{% include '/public/domains/auth/register.js' %}
+
+Object.assign(
+ routes,
+ {
+ "/login": layout_decorator(Login),
+ "/register": layout_decorator(Register),
+ }
+);
diff --git a/myapp/templates/public/domains/auth/login.js b/myapp/templates/public/domains/auth/login.js
new file mode 100644
index 0000000..eff6841
--- /dev/null
+++ b/myapp/templates/public/domains/auth/login.js
@@ -0,0 +1,70 @@
+function Login() {
+ let data = {
+ username: '',
+ password: ''
+ };
+ function login() {
+ if (data.username.length==0 || data.password.length==0) {
+ return;
+ }
+ m.request({
+ url: '/api',
+ method: "POST",
+ body: {
+ "jsonrpc": "2.0",
+ "method": 'auth.login',
+ "params": {
+ "username": data.username,
+ "password": data.password
+ },
+ "id": 1
+ }
+ }).then(
+ function(response) {
+ if ('result' in response) {
+ window.location.href = '/';
+ } else if ('error' in response) {
+ data.error = response['error'];
+ }
+ }
+ );
+ };
+ function form_submit(e) {
+ e.preventDefault();
+ login();
+ };
+ return {
+ data: data,
+ view: function(vnode) {
+ let result = [];
+ result.push(
+ m('div', {class: 'row justify-content-center my-3'},
+ m('div', {class: 'col-md-6'}, [
+ m('h3', [
+ {tag: '<', children: '
Забыл пароль'},
+ 'Вход',
+ {tag: '<', children: '
'},
+ ]),
+ m('form', {onsubmit: form_submit}, [
+ m('div', {class: "input-group mb-3"}, [
+ {tag: '<', children: '
'},
+ m('input', {class: 'form-control', placeholder: 'Логин', type: 'text', oninput: function (e) {data.username = e.target.value}, value: data.username}),
+ ]),
+ m('div', {class: "input-group mb-3"}, [
+ {tag: '<', children: '
'},
+ m('input', {class: 'form-control', placeholder: 'Пароль', type: 'password', oninput: function (e) {data.password = e.target.value}, value: data.password}),
+ ]),
+ m('div', {class: 'row'},
+ m('div', {class: "col py-2"}, [
+ m(m.route.Link, {class: 'btn btn-outline-secondary', href: '/register'}, 'Регистрация'),
+ m('button', {class: 'btn btn-outline-success float-end', type: 'submit'}, 'Войти')
+ ]),
+ ),
+ ])
+ ])
+ )
+ )
+ return result;
+ }
+ };
+};
diff --git a/myapp/templates/public/domains/page/pages.js b/myapp/templates/public/domains/page/pages.js
new file mode 100644
index 0000000..d72e85a
--- /dev/null
+++ b/myapp/templates/public/domains/page/pages.js
@@ -0,0 +1,180 @@
+function Pages() {
+ let data = {
+ filter: PanelFilter(),
+ order_by: PanelOrderBy({
+ field: 'title',
+ fields: [
+ {value: 'id', text: 'ID'},
+ {value: 'title', text: 'заголовку'},
+ {value: 'created', text: 'дате создания'},
+ {value: 'updated', text: 'дате обновления'}
+ ],
+ clickHandler: pages_get,
+ order: 'asc',
+ }),
+ raw_pages: [],
+ get pages() {
+ /* Отфильтрованный список */
+ let value = data.filter.data.value;
+ if ( value.length<1 ) {
+ return data.raw_pages;
+ }
+ if (data.filter.data.isregex) {
+ try {
+ let regex = new RegExp(value, 'ig');
+ } catch (e) {
+ console.log(e);
+ return data.raw_pages;
+ }
+ }
+ let result = data.raw_pages.filter(page_filter);
+ return result;
+ },
+ pagination: Pagination({
+ clickHandler: pages_get,
+ prefix_url: '/pages'
+ }),
+ };
+ function page_filter(page) {
+ /* Фильтр статей */
+ let value = data.filter.data.value;
+ if ( value.length<1 ) {
+ return true;
+ }
+ let isTitle = null;
+ if ( data.filter.data.isregex) {
+ let regex = new RegExp(value, 'ig');
+ isTitle = regex.test(page.title.toLowerCase());
+ } else {
+ isTitle = page.title.toLowerCase().includes(value.toLowerCase());
+ }
+ if ( isTitle ) {
+ return true;
+ }
+ return false;
+ };
+ function breadcrumbs_render() {
+ let result = m('ul', {class: 'breadcrumb mt-3'}, [
+ m('li', {class: 'breadcrumb-item'}, m(m.route.Link, {href: '/'}, m('i', {class: 'fa fa-home'}))),
+ m('li', {class: 'breadcrumb-item active'}, 'Список статей'),
+ ]);
+ return result;
+ };
+ function pages_get() {
+ let order_by = data.order_by.data;
+ let pagination = data.pagination.data;
+ m.request({
+ url: '/api',
+ method: "POST",
+ body: [
+ {
+ "jsonrpc": "2.0",
+ "method": 'pages',
+ "params": {
+ "page": pagination.page,
+ "order_by": {
+ "field": order_by.field,
+ 'order': order_by.order
+ },
+ "fields": ["id", "title", "tags"]
+ },
+ "id": 1
+ },
+ {
+ "jsonrpc": "2.0",
+ "method": 'pages.count',
+ "id": 1
+ }
+ ]
+
+ }).then(
+ function(response) {
+ if ('result' in response[0]) {
+ data.raw_pages = response[0]['result'];
+ }
+ if ('result' in response[1]) {
+ data.pagination.size = response[1]['result'];
+ }
+ }
+ );
+ };
+ function page_render(page, pageIdx) {
+ let odd = '';
+ if (pageIdx % 2) {
+ odd = ' bg-light'
+ };
+ return m('div', {class: 'row'},
+ m('div', {class: `col py-2 ${odd}`}, [
+ m(m.route.Link, {href: `/page/${page.id}`}, m.trust(page.title)),
+ m('div', {class: 'row'},
+ ),
+ ])
+ );
+ };
+ function pages_render() {
+ return data.pages.map(page_render);
+ };
+ return {
+ oninit: function(vnode) {
+ let pagination = data.pagination.data;
+ if (vnode.attrs.page!==undefined) {
+ pagination.page = Number(vnode.attrs.page);
+ };
+ document.title = `Список статей - ${SETTINGS.TITLE}`;
+ pages_get();
+ },
+ view: function(vnode) {
+ let result = [];
+ result.push(
+ breadcrumbs_render(),
+ m('div', {class: 'row'},
+ m('div', {class: 'col h1 py-1'}, [
+ m('div', {class: "btn-group btn-group-lg me-2"}, [
+ m('button', {type: "button", class: "btn btn-outline-secondary", onclick: function() { panel_show(data.filter.data) }},
+ m('i', {class: "fa fa-filter"})
+ ),
+ m('button', {type: "button", class: "btn btn-outline-secondary", onclick: function() { panel_show(data.order_by.data) }},
+ m('i', {class: "fa fa-sort-alpha-asc"})
+ )
+ ]),
+ 'Статьи',
+ ])
+ ),
+ m('hr'),
+ );
+ result.push(m(data.filter));
+ result.push(m(data.order_by));
+ result.push(m(data.pagination));
+ if (data.pages.length>0) {
+ result.push(m(ComponentPages, {pages: data.pages}));
+ result.push(m(data.pagination));
+ };
+ result.push(breadcrumbs_render());
+ return result
+ }
+ }
+};
+/*
+
+*/
diff --git a/myapp/templates/public/layout.js b/myapp/templates/public/layout.js
new file mode 100644
index 0000000..405ef9c
--- /dev/null
+++ b/myapp/templates/public/layout.js
@@ -0,0 +1,20 @@
+function layout_decorator(controller) {
+ return {
+ render: function(vnode) {
+ return m(Layout, m(controller, vnode.attrs))
+ }
+ }
+};
+function Layout() {
+ return {
+ view: function(vnode) {
+ let result = [
+ m(MenuGeneral),
+ m("section", vnode.children),
+ m(Footer),
+ m(Backtotop),
+ ];
+ return result;
+ }
+ }
+};
diff --git a/myapp/templates/navbar.html b/myapp/templates/public/navbar.html
similarity index 100%
rename from myapp/templates/navbar.html
rename to myapp/templates/public/navbar.html
diff --git a/myapp/templates/public/settings.js b/myapp/templates/public/settings.js
new file mode 100644
index 0000000..e39dca2
--- /dev/null
+++ b/myapp/templates/public/settings.js
@@ -0,0 +1,4 @@
+const SETTINGS = {
+ ITEMS_ON_PAGE: {{ ITEMS_ON_PAGE }},
+ TITLE: 'Моя панель',
+}
diff --git a/myapp/templates/public/skeleton.html b/myapp/templates/public/skeleton.html
new file mode 100644
index 0000000..28f8c93
--- /dev/null
+++ b/myapp/templates/public/skeleton.html
@@ -0,0 +1,22 @@
+
+
+ {% include 'header.html' %}
+
+
+
+{% include '/public/navbar.html' %}
+
+{% block content %}
+{% endblock content %}
+
+{% block breadcrumb %}
+{% endblock %}
+
+{% include 'footer.html' %}
+
+
+{% block script %}{% endblock %}
+
+
+
+
diff --git a/myapp/templates/routes.js b/myapp/templates/routes.js
new file mode 100644
index 0000000..a69027a
--- /dev/null
+++ b/myapp/templates/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
+);
diff --git a/myapp/templates/skeleton.html b/myapp/templates/skeleton.html
index 29636b9..efa4b17 100644
--- a/myapp/templates/skeleton.html
+++ b/myapp/templates/skeleton.html
@@ -4,7 +4,7 @@
-{% include 'navbar.html' %}
+{% include '/public/navbar.html' %}
{% block content %}
{% endblock content %}
diff --git a/myapp/views.py b/myapp/views.py
index f98ec7d..a21c9ab 100644
--- a/myapp/views.py
+++ b/myapp/views.py
@@ -2,9 +2,22 @@ __author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
-from myapp import app
from flask import render_template, Response
+from myapp import app, lib
+
+
+@app.route('/app.js')
+def app_js():
+ """Фильтр
+ """
+ pagedata = {}
+ if lib.get_user():
+ body = render_template('/private/app.js', pagedata=pagedata)
+ else:
+ body = render_template('/public/app.js', pagedata=pagedata)
+ return Response(body, mimetype='application/javascript')
+
@app.route('/')
def index():