From 715494fa5f774269ed234447aef4e14e8eb8cd2b Mon Sep 17 00:00:00 2001 From: Alexandr Bogomyakov Date: Mon, 18 Mar 2024 19:06:10 +0200 Subject: [PATCH] Restore UI --- templates/base.html | 178 ++++++++++----------- templates/clients.html | 289 ++++++++++++++++----------------- templates/index.html | 351 ++++++++++++++--------------------------- templates/sync.html | 39 ++--- 4 files changed, 347 insertions(+), 510 deletions(-) mode change 100755 => 100644 templates/base.html mode change 100755 => 100644 templates/clients.html mode change 100755 => 100644 templates/index.html mode change 100755 => 100644 templates/sync.html diff --git a/templates/base.html b/templates/base.html old mode 100755 new mode 100644 index e0aa12b..8502e96 --- a/templates/base.html +++ b/templates/base.html @@ -1,113 +1,93 @@ - - {% block title %}Dashboard{% endblock %} - - - - - - - - + {% block title %}Dashboard{% endblock %} + + + -
-
-
-
-

OutFleet {{VERSION}} -

- -
-
-
-
-
- {% block content %}{% endblock %} +
+ + {% block content %}{% endblock %} +
+ + + +{% if nt %} + +{% endif %} - - \ No newline at end of file + diff --git a/templates/clients.html b/templates/clients.html old mode 100755 new mode 100644 index e0fc40a..97d8ef5 --- a/templates/clients.html +++ b/templates/clients.html @@ -2,190 +2,173 @@ {% block content %} -
-
+
+

Clients

-
-
- + -
-
{% for client, values in CLIENTS.items() %} -
-
+
+
{{ values["name"] }}
-

Allowed {{ values["servers"]|length }} server{% if values["servers"]|length >1 - %}s{%endif%}

+

Allowed {{ values["servers"]|length }} server{% if values["servers"]|length >1 %}s{%endif%}

{% endfor %} - +
+
+ + +
+
-
- {% if add_client %} -
-
-

Add new client

+{% if add_client %} +
+
+
+

Add new client

+
-
-
+
- - - {% for server in SERVERS %} - - {% endfor %} - +
+
+ +
+
+ +
+
+ {% for server in SERVERS %} + + + {% endfor %} + +
+ +
+
- {% endif %} - - {% if selected_client and not add_client %} - {% set client = CLIENTS[selected_client] %} -
-
-
-
-

{{client['name']}}

-

{{ selected_client }}

- {% if client['comment'] != "" %}

{{ client['comment'] }}

{% endif %} -
-
-
-
-
+{% endif %} -
-
-
-
- - -
-
- -
- +{% if selected_client and not add_client %} + {% set client = CLIENTS[selected_client] %} -
-

Allow access to:

- {% for server in SERVERS %} - +
+
+
+

{{client['name']}}

+

{{ client['comment'] }}

+

id {{ selected_client }}

- {% endfor %} - -
- -
-
-
- - - - -
-
-
-
-

Invite text

+
+
+
+
+
+ + +
+
+ +
+ - - -
-
-
- -
- +{%- endfor -%}
+
+
+
+

Dynamic Access Keys

+ + + + + + + + + {% for server in SERVERS %} + {% if server.info()['local_server_id'] in client['servers'] %} + + + + + {% endif %} + {% endfor %} + +
ServerDynamic
{{ server.info()['name'] }} +

{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}

+
-
-
-

Dynamic Access Keys

- - - - - - - - - {% for server in SERVERS %} - {% if server.info()['local_server_id'] in client['servers'] %} - - - - - {% endif %} - {% endfor %} - -
ServerDynamic
{{ server.info()['name'] }} - {% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ - dynamic_hostname - }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% - endif %}{% endfor %} -
-
-
-

SS Links

- - - - - - - - - {% for server in SERVERS %} - {% if server.info()['local_server_id'] in client['servers'] %} - - - - - {% endif %} - {% endfor %} - -
ServerSSlink
{{ server.info()['name'] }} - {% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}{{ - key.access_url }}{% endif %}{% endfor %} -
-
+
+

SS Links

+ + + + + + + + + {% for server in SERVERS %} + {% if server.info()['local_server_id'] in client['servers'] %} + + + + + {% endif %} + {% endfor %} + +
ServerSSlink
{{ server.info()['name'] }} + 
{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}{{ key.access_url }}{% endif %}{% endfor %}
+
- {% endif %} -
-{% endblock %} \ No newline at end of file +
+
+ + + + + +
+
+{% endif %} + +{% endblock %} diff --git a/templates/index.html b/templates/index.html old mode 100755 new mode 100644 index 9afc047..3628a0e --- a/templates/index.html +++ b/templates/index.html @@ -1,261 +1,150 @@ {% extends "base.html" %} {% block content %} -
-
-
-

Servers

-
- {% for server in SERVERS %} + +
+
+

Servers

+
+ {% for server in SERVERS %} {% set list_ns = namespace(total_bytes=0) %} {% for key in server.data["keys"] %} - {% if key.used_bytes %} - {% set list_ns.total_bytes = list_ns.total_bytes + key.used_bytes %} - {% endif %} + {% if key.used_bytes %} + {% set list_ns.total_bytes = list_ns.total_bytes + key.used_bytes %} + {% endif %} {% endfor %} -
-
-
{{ server.info()["name"] }}
-

API {{ '/'.join(server.info()["url"].split('/')[0:-1]).split("://")[1] }}

-

Client Port: {{ server.info()["port_for_new_access_keys"] }}

-

Hostname: {{ server.info()["hostname_for_access_keys"] }}

-

Traffic: {{ list_ns.total_bytes | filesizeformat }}

-

Version: {{ server.info()["version"] }}

-

- {{ server.info()["comment"] }} -

-
-
- {% endfor %} - {% for broken_server in BROKEN_SERVERS %} - {% set config = broken_server["config"] %} - {% set error = broken_server["error"] %} -
-
-
{{ config.get("name", "None") }}
-

API {{ '/'.join(config.get("url", "None").split('/')[0:-1]).split("://")[1] }} -

-

Client Port: N/D

-

Hostname: N/D

-

Traffic: N/D

-

Version: N/D

-

- {{ config.get("comment", "None") }} - -

-
- {{ error }} -
-
-
- {% endfor %} -
-
- + -
+
+
+
{{ server.info()["name"] }}
+

{{ '/'.join(server.info()["url"].split('/')[0:-1]) }}

+

Port {{ server.info()["port_for_new_access_keys"] }}

+

Hostname {{ server.info()["hostname_for_access_keys"] }}

+

Traffic: {{ list_ns.total_bytes | filesizeformat }}

+

v.{{ server.info()["version"] }}

+

+ {{ server.info()["comment"] }} +

+ {% endfor %} +
+
+ + +
+
-
- {% if add_server %} -
-
+
+ +{% if add_server %} +
+
+

Add new server

-
-
-
-
- -
-
- -
-
- -
+ +
+
+
+
- -
- -
+
+ +
+
+ +
+
+ + +
+
+{% endif %} - {% endif %} - {% if SERVERS|length != 0 and not add_server %} +{% if SERVERS|length != 0 and not add_server %} {% if selected_server is none %} - {% set server = SERVERS[0] %} + {% set server = SERVERS[0] %} {% else %} - {% set server = SERVERS[selected_server|int] %} + {% set server = SERVERS[selected_server|int] %} {% endif %} - -
- {% if not is_broken %} -
-
-
-
-

{{server.info()["name"]}}

-

- v.{{server.info()["version"]}} {{server.info()["local_server_id"]}} -

-
+
+
+
+
+

{{server.info()["name"]}}

+

+ v.{{server.info()["version"]}} {{server.info()["local_server_id"]}} +

- {% set ns = namespace(total_bytes=0) %} - {% for key in SERVERS[selected_server|int].data["keys"] %} +
+ + {% set ns = namespace(total_bytes=0) %} + {% for key in SERVERS[selected_server|int].data["keys"] %} {% if key.used_bytes %} - {% set ns.total_bytes = ns.total_bytes + key.used_bytes %} + {% set ns.total_bytes = ns.total_bytes + key.used_bytes %} {% endif %} - {% endfor %} -
-

Clients: {{ server.info()['keys']|length }}

-

Total traffic: {{ ns.total_bytes | filesizeformat }}

-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- Created {{format_timestamp(server.info()['created_timestamp_ms']) }} -
- -
-

Share anonymous metrics

- - - -
-
-
- - - - -
- + {% endfor %} +
+

Clients: {{ server.info()['keys']|length }}

+

Total traffic: {{ ns.total_bytes | filesizeformat }}

+
+
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+

Share anonymous metrics

+ + + +
+
+
+ + + +
+
- {% else %} - - {% for server in BROKEN_SERVERS %} - {% if server["id"] == selected_server %} - {% set config_block = server["config"] %} - {% endif %} - {% endfor %} - {{config_block}} {{id}} -
-
-
-
-

{{config_block["name"]}}

-
-
-
-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
-
-
- - - - -
- -
-
-
- {% endif %}
- {% endif %} -
-{% endblock %} \ No newline at end of file +{% endif %} + +{% endblock %} diff --git a/templates/sync.html b/templates/sync.html old mode 100755 new mode 100644 index b38a0d7..292cbf5 --- a/templates/sync.html +++ b/templates/sync.html @@ -1,32 +1,17 @@ -{% extends "base.html" %} - -{% block content %} - - - - - - - - - -

Last logs

+

Last sync log

- -

Also wipe ALL keys on ALL servers? Use in case of inconsistency.

- - - -
+

Wipe ALL keys on ALL servers?

+ + + + -
-    
+
+    
 {% for line in lines %}{{ line }}{% endfor %}
     
 

-
-{% endblock %}
\ No newline at end of file