New UI

Co-authored-by: XakPlant <xakplant@users.noreply.github.com>

templates/clients.html

@@ -2,13 +2,12 @@
 
 {% block content %}
 
-<div id="list" class="pure-u-1-3" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
-    <div class="server-item pure-g">
-        <h1 class="server-content-title">Clients</h1>
-    </div>
+<div id="entety-menu">
+<div id="list">
+    <h1 class="server-content-title">Clients</h1>
     {% for client, values in CLIENTS.items() %}
     <div class="server-item server-item-{% if client == selected_client %}unread{% else %}selected{% endif %} pure-g">
-        <div class="pure-u-3-4" onclick="location.href='/clients?selected_client={{ client }}';">
+        <div class="" onclick="location.href='/clients?selected_client={{ client }}';">
             <h5 class="server-name">{{ values["name"] }}</h5>
             <h4 class="server-info">Allowed {{ values["servers"]|length }} server{% if values["servers"]|length >1 %}s{%endif%}</h4>
         </div>
@@ -21,11 +20,13 @@
     </div>
 
 </div>
+</div>
 
 {% if add_client %}
-    <div class="pure-u-1-3">
+<div id="content">
+    <div class="">
         <div class="server-content-header pure-g">
-            <div class="pure-u-1-2">
+            <div class="">
                 <h1 class="server-content-title">Add new client</h1>
             </div>
         </div>
@@ -33,11 +34,11 @@
         <form action="/add_client" class="pure-form pure-form-stacked" method="POST">
             <fieldset>
                 <div class="pure-g">
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="name" required placeholder="Name"/>
+                    <div class="pure-u-1 ">
+                        <input type="text" class="" name="name" required placeholder="Name"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="comment"  placeholder="Comment"/>
+                    <div class="pure-u-1 ">
+                        <input type="text" class="" name="comment"  placeholder="Comment"/>
                     </div>
                             <div class="pure-checkbox">
                                 {% for server in SERVERS %}
@@ -54,15 +55,17 @@
         </form>
     </div>
     </div>
+</div>
 {% endif %}
 
 
 {% if selected_client and not add_client %}
     {% set client = CLIENTS[selected_client] %}
 
-    <div class="pure-u-1-2">
+    <div id="content">
+    <div class="">
         <div class="server-content-header pure-g">
-            <div class="pure-u-1-2">
+            <div class="">
                 <h1 class="server-content-title">{{client['name']}}</h1>
                 <h4 class="server-info">{{ client['comment'] }}</h4>
                 <h4 class="server-info">id {{ selected_client }}</h4>
@@ -73,11 +76,11 @@
         <form action="/add_client" class="pure-form pure-form-stacked" method="POST">
             <fieldset>
                 <div class="pure-g">
-                    <div class="pure-u-1 pure-u-md-1-3">
+                    <div class="pure-u-1 ">
                         <input type="text" class="pure-u-1" name="name" required value="{{client['name']}}"/>
                         <input type="hidden" class="pure-u-1" name="old_name" required value="{{client['name']}}"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
+                    <div class="pure-u-1 ">
                         <input type="text" class="pure-u-1" name="comment" value="{{client['comment']}}"/>
                     </div>
                     <input type="hidden" class="pure-u-1" name="user_id" value="{{selected_client}}"/>
@@ -101,19 +104,23 @@
 
         <div>
             <h3>Invite text</h3><hr>
-            <textarea style="width: 100%; rows=10">
-Install OutLine VPN. Copy and paste below keys to OutLine client.
-Same keys will work simultaneously on many devices.
-{% for server in SERVERS -%}
+                <p>Install Outline VPN. Copy and paste the keys below into the Outline client.
+                The same keys can be used simultaneously on multiple devices.</p>
+                {% for server in SERVERS -%}
+                    {% if server.info()['local_server_id'] in client['servers'] %}
+                    {% set salt = bcrypt.gensalt() %}
+                    {% set secret_string = server.info()['local_server_id'] + selected_client %}
+                    {% set hash_secret = bcrypt.hashpw(
+                        password=secret_string.encode('utf-8'),
+                        salt=salt).decode('utf-8') %}
 
-{% if server.info()['local_server_id'] in client['servers'] %}
-{{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 %}```
-{% endif %}
-{%- endfor -%}</textarea>
+                <p><b>Server location:</b> {{server.info()['name']}}</p>
+                <p><b>Client link:</b> {% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['local_server_id'][0:SECRET_LINK_LENGTH]}}{{selected_client[0:SECRET_LINK_LENGTH]}}{{hash_secret[SECRET_LINK_PREFIX|length:]}}#{{server.info()['comment']}}{% endif %}{% endfor %}</p>
+                {% endif %}
+                {%- endfor -%}
         </div>
             <hr>
-<div style="padding-top: 15px; padding-bottom: 15px">
+<div>
     <div class="pure-u-1">
         <h3>Dynamic Access Keys</h3>
         <table class="pure-table">
@@ -174,6 +181,7 @@ Same keys will work simultaneously on many devices.
          </form>
     </div>
     </div>
+</div>
 {% endif %}
 
 {% endblock %}

templates/index.html

@@ -2,10 +2,11 @@
 
 {% block content %}
 
-<div id="list" class="pure-u-1-3" xmlns="http://www.w3.org/1999/html">
-    <div class="server-item pure-g">
-        <h1 class="server-content-title">Servers</h1>
-    </div>
+
+       
+<div id="entety-menu">
+<div>
+    <h1 class="server-content-title">Servers</h1>
     {% for server in SERVERS %}
         {% set total_traffic = namespace(total_bytes=0) %}
         {% for key in server.data["keys"] %}
@@ -34,26 +35,28 @@
     </div>
 
 </div>
+</div>
 
 {% if add_server %}
-    <div class="pure-u-1-3">
+<div id="content">
+    <div >
         <div class="server-content-header pure-g">
-            <div class="pure-u-1-2">
+            <div >
                 <h1 class="server-content-title">Add new server</h1>
             </div>
         </div>
         <div class="server-content-body">
         <form action="/add_server" class="pure-form pure-form-stacked" method="POST">
             <fieldset>
-                <div class="pure-g">
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="url" placeholder="Server management URL"/>
+                <div >
+                    <div >
+                        <input type="text"  name="url" placeholder="Server management URL"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text"class="pure-u-23-24" name="cert" placeholder="Certificate"/>
+                    <div >
+                        <input type="text" name="cert" placeholder="Certificate"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="comment"  placeholder="Comment"/>
+                    <div >
+                        <input type="text"  name="comment"  placeholder="Comment"/>
                     </div>
                 </div>
                 <button type="submit" class="pure-button pure-input-1 pure-button-primary">Add</button>
@@ -61,9 +64,9 @@
         </form>
     </div>
     </div>
+</div>
 {% endif %}
 
-
 {% if SERVERS|length != 0 and not add_server %}
 
     {% if selected_server is none %}
@@ -71,11 +74,12 @@
     {% else %}
       {% set server = SERVERS[selected_server|int] %}
     {% endif %}
-    <div id="main" class="pure-u-1">
+    <div id="content">
+    <div id="main" >
         <div class="server-content">
             <div class="server-content-header pure-g">
-                <div class="pure-u-1-2">
-                    <h1 class="server-content-title">{{server.info()["name"]}}</h1>
+                <div>
+                    <h1 class="content-title">{{server.info()["name"]}}</h1>
                     <p class="server-content-subtitle">
                         <span>v.{{server.info()["version"]}} {{server.info()["local_server_id"]}}</span>
                     </p>
@@ -95,35 +99,35 @@
     <form class="pure-form pure-form-stacked" method="POST">
         <fieldset>
             <div class="pure-g">
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="name">Server Name</br>This will not be exposed to client</label>
-                    <input type="text" id="name" class="pure-u-23-24" name="name" value="{{server.info()['name']}}"/>
+                    <input type="text" id="name" class="" name="name" value="{{server.info()['name']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="comment">Comment</br>This will be exposed to client and will be used as "Server name" in client Outline app</label>
-                    <input type="text" id="comment" class="pure-u-23-24" name="comment" value="{{server.info()['comment']}}"/>
+                    <input type="text" id="comment" class="" name="comment" value="{{server.info()['comment']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1">
                     <label for="port_for_new_access_keys">Port For New Access Keys</label>
-                    <input type="text" id="port_for_new_access_keys" class="pure-u-23-24" name="port_for_new_access_keys" value="{{server.info()['port_for_new_access_keys']}}"/>
+                    <input type="text" id="port_for_new_access_keys"  name="port_for_new_access_keys" value="{{server.info()['port_for_new_access_keys']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="hostname_for_access_keys">Hostname For Access Keys</label>
-                    <input type="text" id="hostname_for_access_keys" class="pure-u-23-24" name="hostname_for_access_keys" value="{{server.info()['hostname_for_access_keys']}}"/>
+                    <input type="text" id="hostname_for_access_keys"  name="hostname_for_access_keys" value="{{server.info()['hostname_for_access_keys']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="url">Server URL</label>
-                    <input type="text" readonly id="url" class="pure-u-23-24" name="url" value="{{server.info()['url']}}"/>
+                    <input type="text" readonly id="url"  name="url" value="{{server.info()['url']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="cert">Server Access Certificate</label>
-                    <input type="text" readonly id="cert" class="pure-u-23-24" name="cert" value="{{server.info()['cert']}}"/>
+                    <input type="text" readonly id="cert"  name="cert" value="{{server.info()['cert']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="created_timestamp_ms">Created</label>
-                    <input type="text" readonly id="created_timestamp_ms" class="pure-u-23-24" name="created_timestamp_ms" value="{{format_timestamp(server.info()['created_timestamp_ms']) }}"/>
+                    <input type="text" readonly id="created_timestamp_ms"  name="created_timestamp_ms" value="{{format_timestamp(server.info()['created_timestamp_ms']) }}"/>
                 </div>
-                <input type="hidden" readonly id="server_id" class="pure-u-23-24" name="server_id" value="{{server.info()['local_server_id']}}"/>
+                <input type="hidden" readonly id="server_id"  name="server_id" value="{{server.info()['local_server_id']}}"/>
             </div>
             <p>Share anonymous metrics</p>
             <label for="metrics_enabled" class="pure-radio">
@@ -144,6 +148,7 @@
             </div>
         </div>
     </div>
+</div>
 
 {% endif %}