diff --git a/libs/webadmin/static/js/events.js b/libs/webadmin/static/js/events.js index 21dddf2..1a95ec0 100644 --- a/libs/webadmin/static/js/events.js +++ b/libs/webadmin/static/js/events.js @@ -16,12 +16,12 @@ var events = [ ]; function format2html(title, context) { - return "
" + - "

" + - "" + title + "" + - context + - "

" + - "
"; + return `
+

+ ${title} + ${context} +

+
`; } function log_query(data) { diff --git a/libs/webadmin/static/js/groups.js b/libs/webadmin/static/js/groups.js index 09b105b..95c3ba8 100644 --- a/libs/webadmin/static/js/groups.js +++ b/libs/webadmin/static/js/groups.js @@ -10,13 +10,12 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function format2html(title, context) { - return "
" + - "" + - "

" + - "" + title + "" + - context + - "

" + - "
"; + return `
+ +

+ ${title}${context} +

+
`; } $(function () { diff --git a/libs/webadmin/static/js/header.js b/libs/webadmin/static/js/header.js index 62caaff..f485d1d 100644 --- a/libs/webadmin/static/js/header.js +++ b/libs/webadmin/static/js/header.js @@ -30,19 +30,19 @@ function header2html(yuuki_name) { nav_list += nav_items(false, p_key, page_list[p_key]) } }); - return "" + - "
" + - "" + - "
"; + return ` +
+ +
`; } $(function () { diff --git a/libs/webadmin/static/js/helpers.js b/libs/webadmin/static/js/helpers.js index c190088..dd3309c 100644 --- a/libs/webadmin/static/js/helpers.js +++ b/libs/webadmin/static/js/helpers.js @@ -10,16 +10,16 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. */ function format2html(title, context) { - return "
" + - "" + - "

" + - "" + title + "" + - context + - "

" + - "
"; + return `
+ +

+ ${title} + ${context} +

+
`; } -$(function(){ +$(function () { $.ajax({ url: "/api", type: "POST", diff --git a/libs/webadmin/static/js/index.js b/libs/webadmin/static/js/index.js index 9332121..b0aae5a 100644 --- a/libs/webadmin/static/js/index.js +++ b/libs/webadmin/static/js/index.js @@ -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"); } } diff --git a/libs/webadmin/static/js/settings.js b/libs/webadmin/static/js/settings.js index ee31eee..def88d6 100644 --- a/libs/webadmin/static/js/settings.js +++ b/libs/webadmin/static/js/settings.js @@ -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("

Disconnected.

"); $.post("/api", { diff --git a/requirements.txt b/requirements.txt index 8ee35dd..54722ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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