Using ES6 template for WA and update requirements.txt

This commit is contained in:
SuperSonic 2020-10-07 14:59:14 +00:00
parent a979675bd8
commit acd83e7b61
7 changed files with 64 additions and 50 deletions

View file

@ -16,12 +16,12 @@ var events = [
];
function format2html(title, context) {
return "<div class=\"media pt-3\">" +
"<p class=\"media-body pb-3 mb-0 small lh-125 border-bottom border-gray\">" +
"<strong class=\"d-block text-gray-dark\">" + title + "</strong>" +
context +
"</p>" +
"</div>";
return `<div class=\"media pt-3\">
<p class=\"media-body pb-3 mb-0 small lh-125 border-bottom border-gray\">
<strong class=\"d-block text-gray-dark\">${title}</strong>
${context}
</p>
</div>`;
}
function log_query(data) {

View file

@ -10,13 +10,12 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
function format2html(title, context) {
return "<div class=\"media pt-3\">" +
"<img class=\"mini-logo mr-2 rounded\" src=\"" + object_server + "/os/g/" + title + "\">" +
"<p class=\"media-body pb-3 mb-0 small lh-125 border-bottom border-gray\">" +
"<strong class=\"d-block text-gray-dark\">" + title + "</strong>" +
context +
"</p>" +
"</div>";
return `<div class=\"media pt-3\">
<img class=\"mini-logo mr-2 rounded\" src=\"${object_server}/os/g/${title}\">
<p class=\"media-body pb-3 mb-0 small lh-125 border-bottom border-gray\">
<strong class=\"d-block text-gray-dark\">${title}</strong>${context}
</p>
</div>`;
}
$(function () {

View file

@ -30,19 +30,19 @@ function header2html(yuuki_name) {
nav_list += nav_items(false, p_key, page_list[p_key])
}
});
return "<nav class=\"navbar navbar-expand-md navbar-dark fixed-top bg-dark\">" +
"<a class=\"navbar-brand\" href=\"/\">" + yuuki_name + " - WebAdmin</a>" +
"<button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarCollapse\"aria-controls=\"navbarCollapse\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">" +
"<span class=\"navbar-toggler-icon\"></span>" +
"</button>" +
"<div class=\"collapse navbar-collapse\" id=\"navbarCollapse\">" +
"<ul class=\"navbar-nav mr-auto\"></ul>" +
"<a href=\"/logout\"><button class=\"btn btn-outline-success my-2 my-sm-0\">Logout</button></a>" +
"</div>" +
"</nav>" +
"<div class=\"nav-scroller bg-white shadow-sm\">" +
"<nav class=\"nav nav-underline\">" + nav_list + "</nav>" +
"</div>";
return `<nav class=\"navbar navbar-expand-md navbar-dark fixed-top bg-dark\">
<a class=\"navbar-brand\" href=\"/\"> ${yuuki_name} - WebAdmin</a>
<button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarCollapse\"aria-controls=\"navbarCollapse\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">
<span class=\"navbar-toggler-icon\"></span>
</button>
<div class=\"collapse navbar-collapse\" id=\"navbarCollapse\">
<ul class=\"navbar-nav mr-auto\"></ul>
<a href=\"/logout\"><button class=\"btn btn-outline-success my-2 my-sm-0\">Logout</button></a>
</div>
</nav>
<div class=\"nav-scroller bg-white shadow-sm\">
<nav class=\"nav nav-underline\">${nav_list}</nav>
</div>`;
}
$(function () {

View file

@ -10,16 +10,16 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
function format2html(title, context) {
return "<div class=\"media pt-3\">" +
"<img class=\"mini-logo mr-2 rounded\" src=\"" + object_server + "/os/p/" + title + "\">" +
"<p class=\"media-body pb-3 mb-0 small lh-125 border-bottom border-gray\">" +
"<strong class=\"d-block text-gray-dark\">" + title + "</strong>" +
context +
"</p>" +
"</div>";
return `<div class=\"media pt-3\">
<img class=\"mini-logo mr-2 rounded\" src=\"${object_server}/os/p/${title}\">
<p class=\"media-body pb-3 mb-0 small lh-125 border-bottom border-gray\">
<strong class=\"d-block text-gray-dark\">${title}</strong>
${context}
</p>
</div>`;
}
$(function(){
$(function () {
$.ajax({
url: "/api",
type: "POST",

View file

@ -23,7 +23,7 @@ function init(id, data) {
let ajax_result = response.result;
if (ajax_result.length) {
$(id).text(ajax_result[ajax_result.length - 1]);
} else {
} else {
$(id).text("Nothing");
}
}

View file

@ -1,3 +1,11 @@
/*
Yuuki_Libs
(c) 2020 Star Inc.
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
function shutdown() {
$(".container").html("<p class=\"my-3 p-3 bg-white rounded shadow-sm\">Disconnected.</p>");
$.post("/api", {

View file

@ -1,17 +1,24 @@
beautifulsoup4==4.8.2
gevent==1.4.0
flask==1.1.1
bootstrap-flask==1.2.0
certifi==2019.11.28
beautifulsoup4==4.9.3
Bootstrap-Flask==1.5
certifi==2020.6.20
chardet==3.0.4
gitdb2==3.0.2
GitPython==3.0.8
idna==2.9
PyYAML==5.3
requests==2.23.0
six==1.14.0
smmap2==2.0.5
click==7.1.2
Flask==1.1.2
gevent==20.9.0
gitdb2==4.0.2
GitPython==3.1.9
greenlet==0.4.17
idna==2.10
itsdangerous==1.1.0
PyYAML==5.3.1
requests==2.24.0
six==1.15.0
smmap2==3.0.1
soupsieve==2.0.1
thrift==0.13.0
tornado==6.0.3
urllib3==1.25.8
yuuki-core==6.5.1
tornado==6.0.4
urllib3==1.25.10
Werkzeug==1.0.1
yuuki-core==6.5.2
zope.event==4.5.0
zope.interface==5.1.2