From 169e2d0d9d253c316fa322d3200230704b57fb76 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Sat, 22 Feb 2025 00:35:17 +0100
Subject: chore(webui): refactored state creation page and route

---
 pkg/webui/html/login.html      |  2 +-
 pkg/webui/html/states.html     | 99 ++++++++++++++++++++++++++++--------------
 pkg/webui/html/states_new.html | 33 --------------
 3 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 pkg/webui/html/states_new.html

(limited to 'pkg/webui/html')

diff --git a/pkg/webui/html/login.html b/pkg/webui/html/login.html
index deb6d4a..bdc8fa7 100644
--- a/pkg/webui/html/login.html
+++ b/pkg/webui/html/login.html
@@ -2,7 +2,7 @@
 <main class="responsive">
   <form action="/login" method="post">
     <fieldset>
-      <div class="field border label{{ if .Forbidden }} invalid{{ end}}">
+      <div class="field border label{{ if .Forbidden }} invalid{{ end }}">
         <input autofocus
                id="username"
                name="username"
diff --git a/pkg/webui/html/states.html b/pkg/webui/html/states.html
index 37d80cf..be8329a 100644
--- a/pkg/webui/html/states.html
+++ b/pkg/webui/html/states.html
@@ -1,38 +1,71 @@
 {{ define "main" }}
 <main class="responsive" id="main">
-  <a href="/states/new">
-    <button class="small-round">
-      <i>add</i>
-      <span>New</span>
-    </button>
-  </a>
-  <table class="clickable-rows no-space">
-    <thead>
-      <tr>
-        <th>Path</th>
-        <th>Updated</th>
-        <th>Locked</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{ range .States }}
-      <tr>
-        <td><a href="/state/{{ .Id }}">{{ .Path }}</a></td>
-        <td><a href="/state/{{ .Id }}">{{ .Updated }}</a></td>
-        <td>
-          <a href="/state/{{ .Id }}">
-            {{ if eq .Lock nil }}no{{ else }}
-            <span>yes</span>
-            <div class="tooltip left max">
-              <b>Lock</b>
-              <p>{{ .Lock }}</p>
-            </div>
+  <div>
+    <div class="tabs">
+      <a data-ui="#explorer"{{ if eq .ActiveTab 0 }} class="active"{{ end }}>States</a>
+      <a data-ui="#new"{{ if eq .ActiveTab 1 }} class="active"{{ end }}>Create New State</a>
+    </div>
+    <div id="explorer" class="page padding{{ if eq .ActiveTab 0 }} active{{ end }}">
+      <table class="clickable-rows no-space">
+        <thead>
+          <tr>
+            <th>Path</th>
+            <th>Updated</th>
+            <th>Locked</th>
+          </tr>
+        </thead>
+        <tbody>
+          {{ range .States }}
+          <tr>
+            <td><a href="/state/{{ .Id }}">{{ .Path }}</a></td>
+            <td><a href="/state/{{ .Id }}">{{ .Updated }}</a></td>
+            <td>
+              <a href="/state/{{ .Id }}">
+                {{ if eq .Lock nil }}no{{ else }}
+                <span>yes</span>
+                <div class="tooltip left max">
+                  <b>Lock</b>
+                  <p>{{ .Lock }}</p>
+                </div>
+                {{ end }}
+              </a>
+            </td>
+          </tr>
+          {{ end }}
+        </tbody>
+      </table>
+    </div>
+    <div id="new" class="page padding{{ if eq .ActiveTab 1 }} active{{ end }}">
+      <form action="/states" enctype="multipart/form-data" method="post">
+        <fieldset>
+          <div class="field border label{{ if .PathError }} invalid{{ end }}">
+            <input autofocus
+                   id="path"
+                   name="path"
+                   required
+                   type="text"
+                   value="{{ .Path }}">
+            <label for="path">Path</label>
+            {{ if .PathDuplicate }}
+            <span class="error">This path already exist</span>
+            {{ else if .PathError }}
+            <span class="error">Invalid path</span>
+            {{ else }}
+            <span class="helper">Valid URL path beginning with a /</span>
             {{ end }}
-          </a>
-        </td>
-      </tr>
-      {{ end }}
-    </tbody>
-  </table>
+          </div>
+          <div class="field label border">
+            <input name="file"
+                   required
+                   type="file">
+            <input type="text">
+            <label>File</label>
+            <span class="helper">JSON state file</span>
+          </div>
+          <button class="small-round" type="submit" value="submit">New</button>
+        </fieldset>
+      </form>
+    </div>
+  </div>
 </main>
 {{ end }}
diff --git a/pkg/webui/html/states_new.html b/pkg/webui/html/states_new.html
deleted file mode 100644
index 68facc7..0000000
--- a/pkg/webui/html/states_new.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{{ define "main" }}
-<main class="responsive">
-  <form action="/states/new" enctype="multipart/form-data" method="post">
-    <fieldset>
-      <div class="field border label{{ if .PathError }} invalid{{ end }}">
-        <input autofocus
-               id="path"
-               name="path"
-               required
-               type="text"
-               value="{{ .Path }}">
-        <label for="path">Path</label>
-        {{ if .PathDuplicate }}
-        <span class="error">This path already exist</span>
-        {{ else if .PathError }}
-        <span class="error">Invalid path</span>
-        {{ else }}
-        <span class="helper">Valid URL path beginning with a /</span>
-        {{ end }}
-      </div>
-      <div class="field label border">
-        <input name="file"
-               required
-               type="file">
-        <input type="text">
-        <label>File</label>
-        <span class="helper">JSON state file</span>
-      </div>
-      <button class="small-round" type="submit" value="submit">New</button>
-    </fieldset>
-  </form>
-</main>
-{{ end }}
-- 
cgit v1.2.3