RemiZOffAlex/myapp-full
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
RemiZOffAlex
2024-07-16 17:49:40 +03:00
parent 6be194b900
commit 129b3b3d0b
14 changed files with 302 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
myapp/templates/error.html
View File

@@ -1,4 +1,8 @@
{% extends "skeleton.html" %}
{% if user %}
{% extends "/public/skeleton.html" %}
{% else %}
{% extends "/private/skeleton.html" %}
{% endif %}
{% block content %}
<h3 class="text-danger">{{ error_code }}: {{ error_message }}</h3>

4
myapp/templates/public/domains/tag/inc.j2
View File

@@ -1,3 +1,5 @@
{% include '/public/domains/tag/menu.js' %}
{% include '/public/domains/tag/pages.js' %}
{% include '/public/domains/tag/tag.js' %}
{% include '/public/domains/tag/tags.js' %}
@@ -5,6 +7,8 @@ Object.assign(
routes,
{
"/tag/:id": layout_decorator(Tag),
"/tag/:id/pages": layout_decorator(TagPages),
"/tag/:id/pages/:page": layout_decorator(TagPages),
"/tags": layout_decorator(Tags),
}
);

45
myapp/templates/public/domains/tag/menu.js Normal file
View File

@@ -0,0 +1,45 @@
function MenuTag() {
let data = {
menuitem: null,
tag: null,
};
function button_common() {
if (data.menuitem===null) {
return {tag: '<', children: '<div class="btn btn-primary me-2"><i class="fa fa-bars"></i></div>'};
} else {
return m(m.route.Link, {class: "btn btn-outline-secondary me-2 text-decoration-none", href: `/tag/${data.tag.id}`, title: data.tag.name}, m('i', {class: 'fa fa-bars'}))
}
};
function button_pages() {
if (data.menuitem==='pages') {
return {tag: '<', children: '<div class="btn btn-primary me-2"">Статьи</div>'};
} else {
return m(m.route.Link, {class: "btn btn-outline-secondary me-2 text-decoration-none", href: `/tag/${data.tag.id}/pages`}, 'Статьи')
}
};
return {
oninit: function(vnode) {
console.log('MenuTag.oninit');
for (let key in vnode.attrs){
data[key] = vnode.attrs[key];
};
},
onupdate: function(vnode) {
console.log('MenuTag.onupdate');
for (let key in vnode.attrs){
data[key] = vnode.attrs[key];
};
},
view: function(vnode) {
console.log('MenuTag.view');
if (data.tag!=null) {
return m('div', {class: 'row'},
m('div', {class: 'col py-2'}, [
button_common(),
button_pages(),
]),
);
};
}
};
};

162
myapp/templates/public/domains/tag/pages.js Normal file
View File

@@ -0,0 +1,162 @@
function TagPages() {
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',
}),
tag: null,
raw_pages: [],
get pages() {
let result = data.raw_pages.filter(page_filter);
return result;
},
pagination: {
page: 1,
size: 0,
prefix_url: '/pages'
},
};
function breadcrumbs_render() {
let result = m('ul', {class: 'breadcrumb mt-2'}, [
m('li', {class: 'breadcrumb-item'}, m(m.route.Link, {href: '/'}, m('i', {class: 'fa fa-home'}))),
m('li', {class: 'breadcrumb-item'}, m(m.route.Link, {href: '/tags'}, 'Список тегов')),
m('li', {class: 'breadcrumb-item'}, m(m.route.Link, {href: `/tag/${data.tag.id}`}, data.tag.name)),
m('li', {class: 'breadcrumb-item active'}, 'Список статей'),
]);
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 tag_get(id) {
m.request({
url: '/api',
method: "POST",
body: {
"jsonrpc": "2.0",
"method": 'tag',
"params": {
"id": id
},
"id": get_id()
}
}).then(
function(response) {
if ('result' in response) {
data.tag = response['result'];
data.pagination.prefix_url = `/tag/${data.tag.id}/pages`;
document.title = `Статьи с тегом [${data.tag.name}`;
pages_get();
}
}
);
};
function pages_get() {
m.request({
url: '/api',
method: "POST",
body: [
{
"jsonrpc": "2.0",
"method": 'tag.pages',
"params": {
"id": data.tag.id,
"page": data.pagination.page,
"order_by": data.order_by.value,
"fields": ["id", "title", "tags"]
},
"id": get_id()
},
{
"jsonrpc": "2.0",
"method": 'tag.pages.count',
"params": {
"id": data.tag.id,
},
"id": get_id()
}
]
}).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'];
}
}
);
}
return {
oninit: function(vnode) {
console.log('TagPages.oninit');
if (vnode.attrs.page!==undefined) {
data.pagination.page = Number(vnode.attrs.page);
};
tag_get(vnode.attrs.id);
},
onbeforeupdate: function(vnode) {
console.log('TagPages.onbeforeupdate');
if (vnode.attrs.page!==undefined) {
if (data.pagination.page.toString() != vnode.attrs.page) {
data.pagination.page = Number(vnode.attrs.page);
pages_get();
}
};
},
view: function(vnode) {
console.log('TagPages.view');
result = [];
if (data.tag!=null) {
result.push(
breadcrumbs_render(),
m('div', {class: 'row'},
m('div', {class: 'col h1 py-2'}, [
m('div', {class: "btn-group btn-group-lg me-2"}, [
m(m.route.Link, {class: "btn btn-outline-secondary", href: `/tag/${data.tag.id}`, title: "Вернуться"}, m('i', {class: "fa fa-chevron-left"})),
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"})
)
]),
`Статьи с тегом [${data.tag.name}]`
]),
m('hr'),
)
);
// result.push(m(MenuTag, {menuitem: 'pages', tag: data.tag}));
result.push({tag: MenuTag, attrs: {menuitem: 'pages', tag: data.tag}});
result.push(m(data.filter));
result.push(m(data.order_by));
result.push(m(Pagination, data.pagination));
if (data.pages.length>0) {
result.push(m(ComponentPages, {pages: data.pages}));
result.push(m(Pagination, data.pagination));
};
result.push(breadcrumbs_render());
};
return result;
}
}
};

11
myapp/templates/public/domains/tag/tag.js
View File

@@ -58,17 +58,6 @@ function Tag() {
// result.push(m(MenuTag, {"tag1": data.tag}));
result.push({ tag: MenuTag, attrs: { tag: data.tag } });
result.push(
m('div', { class: 'row' }, [
m('div', { class: "col-md-4 py-2" },
m(m.route.Link, { class: "btn btn-outline-secondary btn-lg w-100", href: `/tag/${data.tag.id}/notes` }, 'Заметки с тегом'),
),
m('div', { class: "col-md-4 py-2" },
m(m.route.Link, { class: "btn btn-outline-secondary btn-lg w-100", href: `/tag/${data.tag.id}/pages` }, 'Статьи с тегом'),
),
])
);
result.push(
m('div', { class: 'row' },
m('div', { class: "col py-2" }, m.trust(data.tag.description)),