WIP - cleanup / local discovery

hub/templates/admin-config.html

@@ -16,4 +16,42 @@
     <td>{{ipToString .Config.VPNNetwork}}</td>
   </tr>
 </table>
+
+<h2>Peers</h2>
+
+<p>
+  <a href="/admin/peer/create/">Add Peer</a> /
+  <a href="/admin/peer/hosts/">Hosts</a>
+</p>
+
+{{if .Peers -}}
+<table>
+  <thead>
+    <tr>
+      <th>PeerIP</th>
+      <th>Name</th>
+      <th>Public IP</th>
+      <th>Port</th>
+      <th>Relay</th>
+    </tr>
+  </thead>
+  <tbody>
+  {{range .Peers -}}
+  <tr>
+    <td>
+      <a href="/admin/peer/view/?PeerIP={{.PeerIP}}">
+        {{.PeerIP}}
+      </a>
+    </td>
+    <td>{{.Name}}</td>
+    <td>{{ipToString .PublicIP}}</td>
+    <td>{{.Port}}</td>
+    <td>{{if .Relay}}T{{else}}F{{end}}</td>
+  </tr>
+  </tbody>
+  {{- end}}
+</table>
+{{- else}}
+<p>No peers.</p>
+{{- end}}
 {{- end}}

hub/templates/admin-peer-create.html

@@ -3,6 +3,10 @@
 
 <form method="POST">
   <input type="hidden" name="CSRF" value="{{.Session.CSRF}}">
+  <p>
+    <label>IP</label><br>
+    <input type="number" name="IP" min="1" max="255" value="0">
+  </p>
   <p>
     <label>Name</label><br>
     <input type="text" name="Name">

hub/templates/admin-peer-init.html

@@ -0,0 +1,13 @@
+{{define "body" -}}
+<h2>Initialize Peer</h2>
+
+<p>
+  Configure the peer with the following URL:
+</p>
+<pre>
+  {{.HubAddress}}/peer/init/?Code={{.Code}}
+</pre>
+<p>
+  <a href="/admin/config/">Done</a>
+</p>
+{{- end}}

hub/templates/admin-peer-intent.html

@@ -8,6 +8,6 @@
   {{.HubAddress}}/peer/create/?Code={{.Code}}
 </pre>
 <p>
-  <a href="/admin/peer/list/">Done</a>
+  <a href="/admin/config/">Done</a>
 </p>
 {{- end}}

hub/templates/admin-peer-list.html

@@ -1,40 +0,0 @@
-{{define "body" -}}
-<h2>Peers</h2>
-
-<p>
-  <a href="/admin/peer/create/">Add Peer</a> /
-  <a href="/admin/peer/hosts/">Hosts</a>
-</p>
-
-{{if .Peers -}}
-<table>
-  <thead>
-    <tr>
-      <th>PeerIP</th>
-      <th>Name</th>
-      <th>Public IP</th>
-      <th>Port</th>
-      <th>Relay</th>
-    </tr>
-  </thead>
-  <tbody>
-  {{range .Peers -}}
-  <tr>
-    <td>
-      <a href="/admin/peer/view/?PeerIP={{.PeerIP}}">
-        {{.PeerIP}}
-      </a>
-    </td>
-    <td>{{.Name}}</td>
-    <td>{{ipToString .PublicIP}}</td>
-    <td>{{.Port}}</td>
-    <td>{{if .Relay}}T{{else}}F{{end}}</td>
-  </tr>
-  </tbody>
-  {{- end}}
-</table>
-{{- else}}
-<p>No peers.</p>
-{{- end}}
-
-{{- end}}

hub/templates/admin-peer-view.html

@@ -3,6 +3,7 @@
 
 <p>
   <a href="/admin/peer/edit/?PeerIP={{.Peer.PeerIP}}">Edit</a> /
+  <a href="/admin/peer/init/?PeerIP={{.Peer.PeerIP}}">Initialize</a> /
   <a href="/admin/peer/delete/?PeerIP={{.Peer.PeerIP}}">Delete</a>
 </p>
 

hub/templates/base.html

@@ -10,8 +10,6 @@
     <h1>VPPN</h1>
     <nav>
       {{if .Session.SignedIn -}}
-      <a href="/admin/config/">Config</a> /
-      <a href="/admin/peer/list/">Peers</a> /
       <a href="/admin/sign-out/">Sign out</a>
       {{- end}}
     </nav>