From 9cf782ffd6e1da239b4f31eae015f6ec325211b7 Mon Sep 17 00:00:00 2001
From: boris <boris+gitea@ntbx.io>
Date: Mon, 26 Jan 2026 23:36:12 +0000
Subject: [PATCH] Added certificate regeneration. Refactored server dashboard.

---
 .../accounts/templates/accounts/profile.html  |  2 +-
 app/apps/keys/certificates.py                 |  4 +-
 .../servers/templates/servers/detail.html     | 71 +++++++++++--------
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/app/apps/accounts/templates/accounts/profile.html b/app/apps/accounts/templates/accounts/profile.html
index 0d74010..90a693f 100644
--- a/app/apps/accounts/templates/accounts/profile.html
+++ b/app/apps/accounts/templates/accounts/profile.html
@@ -174,7 +174,7 @@
             if (!response.ok) {
               throw new Error("Certificate regeneration failed.");
             }
-            window.location.href = "/api/v1/keys/" + keyId + "/certificate";
+            window.alert("Certificate regenerated.");
           })
           .catch(function (err) {
             window.alert(err.message);
diff --git a/app/apps/keys/certificates.py b/app/apps/keys/certificates.py
index 6173b47..e8f902b 100644
--- a/app/apps/keys/certificates.py
+++ b/app/apps/keys/certificates.py
@@ -120,8 +120,8 @@ def _sign_public_key(
         if not os.path.exists(cert_path):
             stderr = result.stderr.decode("utf-8", "ignore")
             raise RuntimeError(f"ssh-keygen output missing: {cert_path} {stderr}")
-    with open(cert_path, "r", encoding="utf-8") as handle:
-        return handle.read().strip()
+        with open(cert_path, "r", encoding="utf-8") as handle:
+            return handle.read().strip()
 
 
 def _ensure_comment(public_key: str, comment: str) -> str:
diff --git a/app/apps/servers/templates/servers/detail.html b/app/apps/servers/templates/servers/detail.html
index b79940e..638461a 100644
--- a/app/apps/servers/templates/servers/detail.html
+++ b/app/apps/servers/templates/servers/detail.html
@@ -19,20 +19,35 @@
       <a href="{% url 'servers:dashboard' %}" class="text-sm font-semibold text-purple-700 hover:text-purple-800">Back to servers</a>
     </div>
 
+    <nav class="flex flex-wrap gap-2 border-b border-gray-200 pb-2 text-sm font-semibold text-gray-500">
+      <span class="rounded-full bg-purple-50 px-3 py-1 text-purple-700">Details</span>
+      <span class="rounded-full bg-gray-100 px-3 py-1 text-gray-500">Audit</span>
+      <span class="rounded-full bg-gray-100 px-3 py-1 text-gray-500">Shell</span>
+      <span class="rounded-full bg-gray-100 px-3 py-1 text-gray-500">Settings</span>
+    </nav>
+
     <section class="grid gap-4 lg:grid-cols-3">
-      <div class="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm lg:col-span-2">
-        <h2 class="text-lg font-semibold text-gray-900">Access</h2>
+      <div class="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm">
+        <h2 class="text-lg font-semibold text-gray-900">Server details</h2>
         <dl class="mt-4 space-y-3 text-sm text-gray-600">
           <div class="flex items-center justify-between">
-            <dt>Access until</dt>
-            <dd class="font-medium text-gray-900">
-              {% if expires_at %}
-                {{ expires_at|date:"M j, Y H:i" }}
-              {% else %}
-                No expiry
-              {% endif %}
-            </dd>
+            <dt>Hostname</dt>
+            <dd class="font-medium text-gray-900">{{ server.hostname|default:"—" }}</dd>
           </div>
+          <div class="flex items-center justify-between">
+            <dt>IPv4</dt>
+            <dd class="font-medium text-gray-900">{{ server.ipv4|default:"—" }}</dd>
+          </div>
+          <div class="flex items-center justify-between">
+            <dt>IPv6</dt>
+            <dd class="font-medium text-gray-900">{{ server.ipv6|default:"—" }}</dd>
+          </div>
+        </dl>
+      </div>
+
+      <div class="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm lg:col-span-2">
+        <h2 class="text-lg font-semibold text-gray-900">Account & certificate</h2>
+        <dl class="mt-4 space-y-3 text-sm text-gray-600">
           <div class="flex items-center justify-between">
             <dt>Account name</dt>
             <dd class="font-medium text-gray-900">
@@ -77,6 +92,22 @@
               {% endif %}
             </dd>
           </div>
+        </dl>
+      </div>
+
+      <div class="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm lg:col-span-3">
+        <h2 class="text-lg font-semibold text-gray-900">Access</h2>
+        <dl class="mt-4 space-y-3 text-sm text-gray-600">
+          <div class="flex items-center justify-between">
+            <dt>Access until</dt>
+            <dd class="font-medium text-gray-900">
+              {% if expires_at %}
+                {{ expires_at|date:"M j, Y H:i" }}
+              {% else %}
+                No expiry
+              {% endif %}
+            </dd>
+          </div>
           <div class="flex items-center justify-between">
             <dt>Last accessed</dt>
             <dd class="font-medium text-gray-900">
@@ -89,24 +120,6 @@
           </div>
         </dl>
       </div>
-
-      <div class="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm">
-        <h2 class="text-lg font-semibold text-gray-900">Server details</h2>
-        <dl class="mt-4 space-y-3 text-sm text-gray-600">
-          <div class="flex items-center justify-between">
-            <dt>Hostname</dt>
-            <dd class="font-medium text-gray-900">{{ server.hostname|default:"—" }}</dd>
-          </div>
-          <div class="flex items-center justify-between">
-            <dt>IPv4</dt>
-            <dd class="font-medium text-gray-900">{{ server.ipv4|default:"—" }}</dd>
-          </div>
-          <div class="flex items-center justify-between">
-            <dt>IPv6</dt>
-            <dd class="font-medium text-gray-900">{{ server.ipv6|default:"—" }}</dd>
-          </div>
-        </dl>
-      </div>
     </section>
 
     <section class="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm">
@@ -160,7 +173,7 @@
             if (!response.ok) {
               throw new Error("Certificate regeneration failed.");
             }
-            window.location.href = "/api/v1/keys/" + keyId + "/certificate";
+            window.alert("Certificate regenerated.");
           })
           .catch(function (err) {
             window.alert(err.message);