UI - minor services list improvement

ui/entrypoint.py

@@ -2,15 +2,15 @@
 
 from flask import Flask, render_template, current_app
 
-import wrappers
+import wrappers, utils
 import os
 
-
 app = Flask(__name__, static_url_path="/", static_folder="static", template_folder="templates")
 ABSOLUTE_URI = ""
 if "ABSOLUTE_URI" in os.environ :
 	ABSOLUTE_URI = os.environ["ABSOLUTE_URI"]
 app.config["ABSOLUTE_URI"] = ABSOLUTE_URI
+app.jinja_env.globals.update(env_to_summary_class=utils.env_to_summary_class)
 
 @app.route('/')
 @app.route('/home')

ui/templates/instances.html

@@ -20,7 +20,7 @@
 
 	<div class="col col-6">
 		<div class="card border-{{ color }} mb-3" style="max-width: 80rem;">
-			<div class="card-header border-{{ color }} bg-{{ color }}">
+			<div class="card-header border-{{ color }} bg-{{ color }} text-white">
 				{{ instance["name"] }}
 				<div class="btn-group mx-2 float-end" role="group">
 					<button id="btnGroupDrop1" class="btn btn-sm dropdown-toggle btn-light" data-bs-toggle="dropdown" aria-expanded="false">

ui/templates/services.html

@@ -2,38 +2,28 @@
 
 {% block content %}
 
-
 <div class="row justify-content-center">
 
 	{% for service in services %}
-
-	<div class="col col-6">
+	<div class="col col-12 col-lg-4">
 		<div class="card border-primary mb-3" style="max-width: 80rem;">
-			<div class="card-header border-primary bg-primary">
+			<div class="card-header border-primary bg-primary text-white">
 				{{ service["SERVER_NAME"] }}
-				<!--<div class="btn-group mx-2 float-end" role="group">
-					<button id="btnGroupDrop1" class="btn btn-sm dropdown-toggle btn-light" data-bs-toggle="dropdown" aria-expanded="false">
-						<i class="fas fa-cogs"> manage container</i>
-					</button>
-					<ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
-						<li><a class="dropdown-item" href="#">Start</a></li>
-						<li><a class="dropdown-item" href="#">Stop</a></li>
-						<li><a class="dropdown-item" href="#">Restart</a></li>
-						<li><a class="dropdown-item" href="#">Remove</a></li>
-					</ul>
-				</div>
-				<button class="btn btn-sm mx-2 float-end btn-light"><i class="fas fa-redo-alt"></i> reload nginx</button>-->
+				<button class="btn btn-sm ms-2 float-end btn-light"><i class="fas fa-trash-alt"></i></button>
+				<button class="btn btn-sm mx-2 float-end btn-light"><i class="fas fa-edit"></i></button>
+				<a class="btn btn-sm mx-2 float-end btn-light" href="http://{{ service["SERVER_NAME"] }}" target="_blank" ><i class="fas fa-eye"></i></a>
 			</div>
 			<div class="card-body text-dark">
-				<h5 class="card-title">Server name : {{ service["SERVER_NAME"] }}</h5>
+				<h5 class="card-title">Summary</h5>
 				<span class="card-text">
-					Environment variables :<br />
-					{% set envfilter = ["PATH", "NGINX_VERSION", "NJS_VERSION", "PKG_RELEASE"] %}
-					{% for k, v in service.items() %}
-						{% if not k.startswith("PATH=") and not k.startswith("NGINX_VERSION=") and not k.startswith("NJS_VERSION=") and not k.startswith("PKG_RELEASE=") %}
-							{{ k + "=" + v }}<br />
-						{% endif %}
-					{% endfor %}
+					<div class="row justify-content-center">
+						<div class="col col-6">Serve files</div>
+						<div class="col col-6 text-center"><i class="fas fa-{{ env_to_summary_class(service["SERVE_FILES"], "yes") }}"></i></div>
+						<div class="col col-6">Reverse proxy</div>
+						<div class="col col-6 text-center"><i class="fas fa-{{ env_to_summary_class(service["USE_REVERSE_PROXY"], "yes") }}"></i></div>
+						<div class="col col-6">HTTPS</div>
+						<div class="col col-6 text-center"><i class="fas fa-{{ env_to_summary_class(service["AUTO_LETS_ENCRYPT"], "yes") }}"></i></div>
+					</div>
 				</span>
 			</div>
 		</div>

ui/utils.py

@@ -11,3 +11,8 @@ def replace_in_file(file, old_str, new_str) :
 	data = data[::-1].replace(old_str[::-1], new_str[::-1], 1)[::-1]
 	with open(file, "w") as f :
 		f.write(data)
+
+def env_to_summary_class(var, value) :
+	if var == value :
+		return "check text-success"
+	return "times text-danger"