update socketio to 3.0.4

This commit is contained in:
liaralabs 2020-12-14 13:24:41 -08:00
parent f1a06d1600
commit 3a0c7f8452
2 changed files with 73 additions and 68 deletions

View file

@ -1,6 +1,6 @@
flask flask
flask-htpasswd flask-htpasswd
flask-socketio flask-socketio>=5
flask-limiter flask-limiter
eventlet eventlet
requests requests

View file

@ -1,80 +1,85 @@
{% import "macros.html" as macros %} {% import "macros.html" as macros %}
<html> <html>
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{{ title }}</title> <title>{{ title }}</title>
<link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon/favicon.ico') }}"> <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon/favicon.ico') }}">
<link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/darkly/bootstrap.min.css"> <link rel="stylesheet" type="text/css"
<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet"> href="https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/darkly/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/swizzin.css')}}"> <link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css"
rel="stylesheet">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/swizzin.css')}}">
</head> </head>
<body> <body>
<div class="d-flex" id="wrapper"> <div class="d-flex" id="wrapper">
{{macros.build_sidebar(pages=pages)}} {{macros.build_sidebar(pages=pages)}}
{% if config.SHAREDSERVER == True %} {% if config.SHAREDSERVER == True %}
{{macros.build_nav_shared(user=user, apps=pages)}} {{macros.build_nav_shared(user=user, apps=pages)}}
{% else %} {% else %}
{{macros.build_nav(user=user, apps=pages)}} {{macros.build_nav(user=user, apps=pages)}}
{% endif %} {% endif %}
<!-- #page-content-wrapper --> <!-- #page-content-wrapper -->
<div class="container-fluid"> <div class="container-fluid">
<div class="card-columns"> <div class="card-columns">
{% include 'glance.html' %} {% include 'glance.html' %}
{{ macros.build_app_table(apps=pages) }} {{ macros.build_app_table(apps=pages) }}
{% include 'systeminfo.html' %} {% include 'systeminfo.html' %}
{% if quota == True %} {% if quota == True %}
{% include 'quotainfo.html' %} {% include 'quotainfo.html' %}
{% endif %} {% endif %}
{% if (quota == False or config.ADMIN_USER == user) %} {% if (quota == False or config.ADMIN_USER == user) %}
{% include 'diskinfo.html' %} {% include 'diskinfo.html' %}
{% endif %} {% endif %}
{% include 'raminfo.html' %} {% include 'raminfo.html' %}
{% if (config.SHAREDSERVER == True or config.ADMIN_USER == user) %} {% if (config.SHAREDSERVER == True or config.ADMIN_USER == user) %}
{% include 'netinfo.html' %} {% include 'netinfo.html' %}
{% endif %} {% endif %}
</div> </div>
</div>
<!-- /#page-content-wrapper -->
</div> </div>
<!-- /#page-content-wrapper --> <!-- /#body-content-wrapper -->
</div>
<!-- /#body-content-wrapper -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.3.0/socket.io.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.0.4/socket.io.js"></script>
<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script> <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
<script src="{{ url_for('static', filename='js/swizzin.js') }}"></script> <script src="{{ url_for('static', filename='js/swizzin.js') }}"></script>
<script> <script>
{{ macros.build_widget_js() }} { { macros.build_widget_js() } }
{% if config.SHAREDSERVER == True %} {% if config.SHAREDSERVER == True %}
{{ macros.build_widget_js_shared() }} { { macros.build_widget_js_shared() } }
{% endif %} {% endif %}
{% if quota == True %} {% if quota == True %}
(function quotausage() { (function quotausage() {
$.get('{{ url_for('quota_free') }}', function(data) { $.get('{{ url_for('quota_free') }}', function (data) {
var percent = Math.trunc(data["quota"]['perutil']); var percent = Math.trunc(data["quota"]['perutil']);
$("#quotafree").html(data["quota"]['diskfree']); $("#quotafree").html(data["quota"]['diskfree']);
$("#quotaused").html(data["quota"]['diskused']); $("#quotaused").html(data["quota"]['diskused']);
$("#quotatotal").html(data["quota"]['disktotal']); $("#quotatotal").html(data["quota"]['disktotal']);
$("#quotapercent").html(data["quota"]['perutil']); $("#quotapercent").html(data["quota"]['perutil']);
if (Number(data["quota"]['perutil']) > 90) { if (Number(data["quota"]['perutil']) > 90) {
$("#quotaindicator.systemindicator").addClass("bg-danger").removeClass("bg-success bg-warning"); $("#quotaindicator.systemindicator").addClass("bg-danger").removeClass("bg-success bg-warning");
$("#quotaprogress").css("width", percent + "%").attr("aria-valuenow", percent).addClass("bg-danger").removeClass("bg-success bg-warning"); $("#quotaprogress").css("width", percent + "%").attr("aria-valuenow", percent).addClass("bg-danger").removeClass("bg-success bg-warning");
} else if (Number(data["quota"]['perutil']) > 75) { } else if (Number(data["quota"]['perutil']) > 75) {
$("#quotaindicator.systemindicator").addClass("bg-warning").removeClass("bg-success bg-danger"); $("#quotaindicator.systemindicator").addClass("bg-warning").removeClass("bg-success bg-danger");
$("#quotaprogress").css("width", percent + "%").attr("aria-valuenow", percent).addClass("bg-warning").removeClass("bg-success bg-danger"); $("#quotaprogress").css("width", percent + "%").attr("aria-valuenow", percent).addClass("bg-warning").removeClass("bg-success bg-danger");
} else { } else {
$("#quotaindicator.systemindicator").addClass("bg-success").removeClass("bg-warning bg-danger"); $("#quotaindicator.systemindicator").addClass("bg-success").removeClass("bg-warning bg-danger");
$("#quotaprogress").css("width", percent + "%").attr("aria-valuenow", percent).addClass("bg-success").removeClass("bg-danger bg-warning"); $("#quotaprogress").css("width", percent + "%").attr("aria-valuenow", percent).addClass("bg-success").removeClass("bg-danger bg-warning");
} }
setTimeout(function(){quotausage()}, 60000); setTimeout(function () { quotausage() }, 60000);
}); });
})(); })();
{% endif %} {% endif %}
</script> </script>
</body> </body>
</html> </html>