From 3459de36f35839e98e894ae3b58c4f4374d90913 Mon Sep 17 00:00:00 2001
From: Javier Sánchez Parra <jsanchez@soleta.eu>
Date: Wed, 31 Aug 2022 17:45:20 +0200
Subject: Add Servers section

In Servers section/view, users can add or delete ogServers from ogCP
configuration file.

Replaces Repositories views and recycle some of its code.
---
 ogcp/templates/actions/add_repository.html    | 17 ------------
 ogcp/templates/actions/add_server.html        | 17 ++++++++++++
 ogcp/templates/actions/delete_repository.html | 23 ----------------
 ogcp/templates/actions/delete_server.html     | 23 ++++++++++++++++
 ogcp/templates/base.html                      |  4 +--
 ogcp/templates/repositories.html              | 37 --------------------------
 ogcp/templates/servers.html                   | 38 +++++++++++++++++++++++++++
 7 files changed, 80 insertions(+), 79 deletions(-)
 delete mode 100644 ogcp/templates/actions/add_repository.html
 create mode 100644 ogcp/templates/actions/add_server.html
 delete mode 100644 ogcp/templates/actions/delete_repository.html
 create mode 100644 ogcp/templates/actions/delete_server.html
 delete mode 100644 ogcp/templates/repositories.html
 create mode 100644 ogcp/templates/servers.html

(limited to 'ogcp/templates')

diff --git a/ogcp/templates/actions/add_repository.html b/ogcp/templates/actions/add_repository.html
deleted file mode 100644
index e7c50fa..0000000
--- a/ogcp/templates/actions/add_repository.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'repositories.html' %}
-{% import "bootstrap/wtf.html" as wtf %}
-
-{% set sidebar_state = 'disabled' %}
-{% set btn_back = true %}
-
-{% block nav_repository_add %}active{% endblock %}
-{% block content %}
-
-<h1 class="m-5">{{_('Add a repository')}}</h1>
-
-{{ wtf.quick_form(form,
-                  action=url_for('repository_add_post'),
-                  method='post',
-                  button_map={'submit_btn':'primary'}) }}
-
-{% endblock %}
diff --git a/ogcp/templates/actions/add_server.html b/ogcp/templates/actions/add_server.html
new file mode 100644
index 0000000..c86dcba
--- /dev/null
+++ b/ogcp/templates/actions/add_server.html
@@ -0,0 +1,17 @@
+{% extends 'servers.html' %}
+{% import "bootstrap/wtf.html" as wtf %}
+
+{% set sidebar_state = 'disabled' %}
+{% set btn_back = true %}
+
+{% block nav_server_add %}active{% endblock %}
+{% block content %}
+
+<h1 class="m-5">{{_('Add a server')}}</h1>
+
+{{ wtf.quick_form(form,
+                  action=url_for('server_add_post'),
+                  method='post',
+                  button_map={'submit_btn':'primary'}) }}
+
+{% endblock %}
diff --git a/ogcp/templates/actions/delete_repository.html b/ogcp/templates/actions/delete_repository.html
deleted file mode 100644
index 82177a3..0000000
--- a/ogcp/templates/actions/delete_repository.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends 'repositories.html' %}
-{% import "bootstrap/wtf.html" as wtf %}
-
-{% set sidebar_state = 'disabled' %}
-{% set btn_back = true %}
-
-{% block content %}
-
-{{ args }}
-
-<h1 class="m-5">
-  {{ _('Delete repository %(repo_name)s', repo_name=repo_name) }}
-</h1>
-
-{{ wtf.quick_form(form,
-                  action=url_for('repository_delete_post'),
-                  method='post',
-                  button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
-
-{% endblock %}
-
-
diff --git a/ogcp/templates/actions/delete_server.html b/ogcp/templates/actions/delete_server.html
new file mode 100644
index 0000000..8f9417e
--- /dev/null
+++ b/ogcp/templates/actions/delete_server.html
@@ -0,0 +1,23 @@
+{% extends 'servers.html' %}
+{% import "bootstrap/wtf.html" as wtf %}
+
+{% set sidebar_state = 'disabled' %}
+{% set btn_back = true %}
+
+{% block content %}
+
+{{ args }}
+
+<h1 class="m-5">
+{{ _('Delete server %(server_name)s', server_name=form.name.data) }}
+</h1>
+
+{{ wtf.quick_form(form,
+                  action=url_for('server_delete_post'),
+                  method='post',
+                  button_map={'submit': 'primary'},
+                  extra_classes="mx-5") }}
+
+{% endblock %}
+
+
diff --git a/ogcp/templates/base.html b/ogcp/templates/base.html
index dca6fda..da5f1db 100644
--- a/ogcp/templates/base.html
+++ b/ogcp/templates/base.html
@@ -36,8 +36,8 @@
                     <li class="nav-item {% block nav_images%}{% endblock %}">
                         <a class="nav-link" href="{{ url_for('images') }}">{{ _('Images') }}</a>
                     </li>
-                    <li class="nav-item {% block nav_repositories %}{% endblock %}">
-                        <a class="nav-link" href="{{ url_for('repositories') }}">{{ _('Repositories') }}</a>
+                    <li class="nav-item {% block nav_servers %}{% endblock %}">
+                        <a class="nav-link" href="{{ url_for('manage_servers') }}">{{ _('Servers') }}</a>
                     </li>
                     {% if current_user.admin %}
                     <li class="nav-item {% block nav_users %}{% endblock %}">
diff --git a/ogcp/templates/repositories.html b/ogcp/templates/repositories.html
deleted file mode 100644
index 7aa2d06..0000000
--- a/ogcp/templates/repositories.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends 'base.html' %}
-
-{% block nav_repositories %}active{% endblock %}
-
-{% block container %}
-    <form id="repositoriesForm">
-        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
-    </form>
-    {{ super() }}
-</form>
-{% endblock %}
-
-{% block sidebar %}
-    <ul id="repositories-list" class="nav flex-column nav-pills">
-        {% for repository in repositories %}
-            <li id="repository-{{ repository['id'] }}" class="nav-item">
-                <input class="form-check-input" type="checkbox" form="repositoriesForm"
-                       value="{{ repository['id'] }}"
-                       name="{{ repository['name'] }}" />
-                {{ repository['name'] }}
-            </li>
-        {% endfor %}
-    </ul>
-{% endblock %}
-
-{% block commands %}
-  <input class="btn btn-light {% block nav_repository_add %}{% endblock %}" type="submit" value="{{ _('Add repository') }}"
-         form="repositoriesForm" formaction="{{ url_for('repository_add_get') }}" formmethod="get">
-  <input class="btn btn-light {% block nav_repository_delete %}{% endblock %}" type="submit" value="{{ _('Delete repository') }}"
-         form="repositoriesForm" formaction="{{ url_for('repository_delete_get') }}" formmethod="get">
-  {% if btn_back %}
-    <button class="btn btn-danger ml-3" type="button" id="backButton" onclick="history.back()">
-      {{ _("Back") }}
-    </button>
-  {% endif %}
-{% endblock %}
-
diff --git a/ogcp/templates/servers.html b/ogcp/templates/servers.html
new file mode 100644
index 0000000..05b7c18
--- /dev/null
+++ b/ogcp/templates/servers.html
@@ -0,0 +1,38 @@
+{% extends 'base.html' %}
+
+{% block nav_servers %}active{% endblock %}
+
+{% block container %}
+    <form id="serversForm">
+        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+    </form>
+    {{ super() }}
+</form>
+{% endblock %}
+
+{% block sidebar %}
+    <ul id="servers-list" class="nav flex-column nav-pills">
+        {% for server in servers %}
+        {% set server_str = server["ip"] ~ ":" ~ server["port"] %}
+            <li class="nav-item">
+                <input class="form-check-input" type="checkbox" form="serversForm"
+                       value="{{ server_str }}"
+                       name="selected-server" />
+                {{ server["name"] }}
+            </li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+
+{% block commands %}
+  <input class="btn btn-light {% block nav_server_add %}{% endblock %}" type="submit" value="{{ _('Add server') }}"
+         form="serversForm" formaction="{{ url_for('server_add_get') }}" formmethod="get">
+  <input class="btn btn-light {% block nav_server_delete %}{% endblock %}" type="submit" value="{{ _('Delete server') }}"
+         form="serversForm" formaction="{{ url_for('server_delete_get') }}" formmethod="get">
+  {% if btn_back %}
+    <button class="btn btn-danger ml-3" type="button" id="backButton" onclick="history.back()">
+      {{ _("Back") }}
+    </button>
+  {% endif %}
+{% endblock %}
+
-- 
cgit v1.2.3-18-g5258