From ab702c8d02bbfd9029777149c251d06bb5bd450e Mon Sep 17 00:00:00 2001 From: RemiZOffAlex Date: Tue, 16 Jul 2024 18:08:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD=D0=B0=20?= =?UTF-8?q?API=20=D0=B8=D0=B7=20=D0=BC=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/private/components/menu-general.js | 11 +++++------ src/myapp/templates/private/domains/page/pages.js | 2 +- src/myapp/templates/private/navbar.html | 1 - src/myapp/templates/public/components/menu-general.js | 9 ++++----- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/myapp/templates/private/components/menu-general.js b/src/myapp/templates/private/components/menu-general.js index 25953d3..423d4ef 100644 --- a/src/myapp/templates/private/components/menu-general.js +++ b/src/myapp/templates/private/components/menu-general.js @@ -25,12 +25,11 @@ function MenuGeneral() { result.push( m('div', {class: 'row'}, m('div', {class: 'col py-2'}, [ - m(m.route.Link, {class: 'btn btn-outline-secondary', href: '/'}, m('i', {class: 'fa fa-home'})), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/pages'}, 'Статьи'), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/tags'}, 'Метки'), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/users'}, 'Пользователи'), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/api/browse'}, 'API JSON-RPC'), - m('div', {class: 'btn-group float-end'}, + m(m.route.Link, { class: 'btn btn-outline-secondary btn-lg', href: '/'}, m('i', {class: 'fa fa-home'})), + m(m.route.Link, { class: 'btn btn-outline-secondary btn-lg border-0', href: '/pages'}, 'Статьи'), + m(m.route.Link, { class: 'btn btn-outline-secondary btn-lg border-0', href: '/tags'}, 'Метки'), + m(m.route.Link, { class: 'btn btn-outline-secondary btn-lg border-0', href: '/users'}, 'Пользователи'), + m('div', { class: 'btn-group btn-group-lg float-end'}, m(m.route.Link, {class: 'btn btn-outline-secondary', href: '/profile'}, m('i', {class: 'fa fa-user'})), m('button', {class: "btn btn-outline-danger", onclick: logout}, m('i', {class: "fa fa-sign-out"})), ) diff --git a/src/myapp/templates/private/domains/page/pages.js b/src/myapp/templates/private/domains/page/pages.js index 49534ff..13de396 100644 --- a/src/myapp/templates/private/domains/page/pages.js +++ b/src/myapp/templates/private/domains/page/pages.js @@ -14,7 +14,7 @@ function Pages() { }), raw_pages: [], get pages() { - let result = data.raw_pages.filter(question_filter); + let result = data.raw_pages.filter(page_filter); return result; }, pagination: Pagination({ diff --git a/src/myapp/templates/private/navbar.html b/src/myapp/templates/private/navbar.html index f42fd69..215bf60 100644 --- a/src/myapp/templates/private/navbar.html +++ b/src/myapp/templates/private/navbar.html @@ -5,7 +5,6 @@ Статьи Метки Пользователи -API JSON-RPC
diff --git a/src/myapp/templates/public/components/menu-general.js b/src/myapp/templates/public/components/menu-general.js index a437365..7ff7667 100644 --- a/src/myapp/templates/public/components/menu-general.js +++ b/src/myapp/templates/public/components/menu-general.js @@ -7,11 +7,10 @@ let MenuGeneral = { result.push( m('div', {class: 'row'}, m('div', {class: 'col py-2'}, [ - m(m.route.Link, {class: 'btn btn-outline-secondary', href: '/'}, m('i', {class: 'fa fa-home'})), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/pages'}, 'Статьи'), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/tags'}, 'Метки'), - m(m.route.Link, {class: 'btn btn-outline-secondary border-0', href: '/api/browse'}, 'API JSON-RPC'), - m(m.route.Link, {class: 'btn btn-outline-success float-end', href: '/login'}, m('i', {class: 'fa fa-sign-in'})), + m(m.route.Link, {class: 'btn btn-outline-secondary btn-lg', href: '/'}, m('i', {class: 'fa fa-home'})), + m(m.route.Link, { class: 'btn btn-outline-secondary btn-lg border-0', href: '/pages'}, 'Статьи'), + m(m.route.Link, { class: 'btn btn-outline-secondary btn-lg border-0', href: '/tags'}, 'Метки'), + m(m.route.Link, { class: 'btn btn-outline-success btn-lg float-end', href: '/login'}, m('i', {class: 'fa fa-sign-in'})), ]) ) )