Merge branch 'develop' into ingress_layout

mattkasun · Sep 27, 2021 · 6fcb53e · 6fcb53e
2 parents 402fb2d + 81edd7a
commit 6fcb53e
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 26 deletions.
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,7 @@
+FROM golang:1.17.1
+WORKDIR /
+COPY *.go go.* ./
+RUN GOOS=linux go build -v .
+ADD /images/* images/
+ADD /html/* html/
+CMD ["./netmaker-gui"]
diff --git a/html/extclient.html b/html/extclient.html
@@ -40,6 +40,7 @@
 
 {{define "ExtClientDetails"}}
 <button class="w3-block w3-white w3-left-align" onclick="openClient('{{.ClientID}}');">{{.ClientID}} @ {{.Network}}</button>
+
 	<div id="client{{.ClientID}}" class="w3-container w3-hide">
 		<p><label>IP </label><input type=disabled placeholder="{{.Address}}"></p>
 	   <p><label>Public Key </label><input type=disabled placeholder="{{.PublicKey}}"></p>

diff --git a/html/header.html b/html/header.html
@@ -18,6 +18,9 @@ <h3>©2021 Matthew R Kasun</h3>
 	    <a href='mailto://mkasun@nusak.ca?subject=netmaker-gui'>mkasun@nusak.ca</a><br>
 	    <a href='https://github.com/mattkasun/netmaker-gui' target='_blank'>github.com/mattkasun/netmaker-gui</a>
 	    <br><br>
+
+			<h4>Version</h4>
+			<h5>Netmaker Backend: {{.Version.Backend}}  Netmaker-Gui:  {{.Version.Mine}}</h5>
 	    <button class="w3-button w3-teal w3-block w3-padding" onclick="document.getElementById('About').style.display='none'">Close</button>
 	</div>
     </div>

diff --git a/html/networks.html b/html/networks.html
@@ -2,15 +2,10 @@
 <div id="Networks" class="btn-group w3-white tab" style="display=none">
     <div class="net All">
 	{{range .Networks}}
-	<form action="/refreshkeys/{{.NetID}}" method="GET" style="display:inline">
-	<p><button class="w3-bar-item" onclick="event.preventDefault();setNetwork('{{.NetID}}');"> {{.DisplayName}} {{.AddressRange}}</button>
-	    <button title="Refresh Keys" class="w3-bar-item w3-button w3-circle w3-white"><span class="material-icons">autorenew</span></button>
-	</form></p>
-	{{ end }}
+	<p><button class="w3-bar-item" onclick="expand('net{{.NetID}}');"> {{.DisplayName}} {{.AddressRange}}</button>
     </div>
 
-    {{ range .Networks }}
-    <fieldset class="net {{.NetID}}">
+    <fieldset class="net {{.NetID}}" id=net{{.NetID}}>
 	<legend>{{.NetID}}</legend>
 	<button class="w3-circle w3-green" type="submit">{{.DisplayName}}</button><br>
 	<label>{{.AddressRange}}<br>
@@ -29,6 +24,9 @@
 		    <input type="hidden" name="network" value='{{.NetID}}'>
 		    <button class="w3-button" type="submit">Delete</button><br>
 		</form>
+	<form action="/refreshkeys/{{.NetID}}" method="GET" style="display:inline">
+	    <button title="Refresh Keys" class="w3-bar-item w3-button w3-circle w3-white"><span class="material-icons">autorenew</span></button>
+	</form></p>
     </fieldset>
     {{ end }}
 </div>

diff --git a/html/nodes.html b/html/nodes.html
@@ -2,23 +2,12 @@
 <div id="Nodes" class="btn-group w3-white tab" style="display=none">
     <div class="net All">
     {{range .Nodes}}
-	<p><button id="node{{.MacAddress}}" class="w3-lightgrey"  onclick="setNetwork('{{.Network}}');">{{.Name}} {{.Endpoint}} {{.Address}}</button></p>
-	{{if eq .IsEgressGateway "yes" }}
-	<button class="w3-bar-item w3-circle w3-white" title="Remove Egress Gateway" onclick="removeEgress('{{.MacAddress}}', '{{.Network}}');"><span class="material-icons">highlight_off</span></button> 
-	{{ else }}
-	<form action="/create_egress/{{.Network}}/{{.MacAddress}}" Method="POST" style="display:inline">
-	<button class="w3-bar-item w3-circle w3-white" title="Create Egress Gateway"><span class="material-icons">router</span></button>
-	</form>
-	{{end}}
-	{{if eq .IsIngressGateway "yes"}}
-	<button class="w3-bar-item w3-circle w3-white" title="Remove Ingress Gateway" onclick="removeIngress('{{.MacAddress}}', '{{.Network}}');"><span class="material-icons">highlight_off</span></button> 
-	{{ else }}
-	<button class="w3-bar-item w3-circle w3-white" title="Create Ingress Gateway" onclick="addIngress('{{.MacAddress}}', '{{.Network}}');"><span class="material-icons">highlight_off</span></button> 
-	{{end}}
-    {{end}}
+	<p><button id="node{{.MacAddress}}" class="w3-lightgrey"  onclick="expand('node{{.MacAddress}}');">{{.Name}} {{.Endpoint}} {{.Address}}</button></p>
     </div>
-    {{range .Nodes}}
-    <fieldset class="net {{.Network}}">
+
+
+
+    <fieldset class="net {{.Network}}" id='node{{.MacAddress}}'>
 	<legend>{{.Name }}</legend>
 	<form action="/edit_node" method=POST>
 	    <input type=hidden name="network" value='{{.Network}}'>
@@ -35,6 +24,19 @@
 	    <input type=hidden name="mac" value='{{.MacAddress}}'>
 	    <button type=submit class="w3-button" onclick="alert('Are you sure you want to delete node {{.Name}} from Network {{.Network}}?')" >Delete</button>
 	</form>
+	{{if eq .IsEgressGateway "yes" }}
+	<button class="w3-bar-item w3-circle w3-white" title="Remove Egress Gateway" onclick="removeEgress('{{.MacAddress}}', '{{.Network}}');"><span class="material-icons">highlight_off</span></button> 
+	{{ else }}
+	<form action="/create_egress/{{.Network}}/{{.MacAddress}}" Method="POST" style="display:inline">
+	<button class="w3-bar-item w3-circle w3-white" title="Create Egress Gateway"><span class="material-icons">router</span></button>
+	</form>
+	{{end}}
+	{{if eq .IsIngressGateway "yes"}}
+	<button class="w3-bar-item w3-circle w3-white" title="Remove Ingress Gateway" onclick="removeIngress('{{.MacAddress}}', '{{.Network}}');"><span class="material-icons">highlight_off</span></button> 
+	{{ else }}
+	<button class="w3-bar-item w3-circle w3-white" title="Create Ingress Gateway" onclick="addIngress('{{.MacAddress}}', '{{.Network}}');"><span class="material-icons">highlight_off</span></button> 
+	{{end}}
+
     </fieldset>
     {{end}}
 </div>

diff --git a/html/script.html b/html/script.html
@@ -186,8 +186,8 @@
     xHttp.send();
 }
 
-function openClient(client) {
-    var x = document.getElementById('client'+client);
+function expand(div) {
+    var x = document.getElementById(div);
     if (x.className.indexOf("w3-show") == -1) {
 	x.className = x.className.replace(" w3-hide", " w3-show");
 	{{/*x.className += " w3-show";*/}}

diff --git a/types.go b/types.go
@@ -8,6 +8,7 @@ import (
 	controller "github.com/gravitl/netmaker/controllers"
 	"github.com/gravitl/netmaker/functions"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/servercfg"
 )
 
 type NodeStatus struct {
@@ -16,6 +17,11 @@ type NodeStatus struct {
 	Color  string
 }
 
+type Version struct {
+	Backend string
+	Mine    string
+}
+
 //PageData -contains data for html template
 type PageData struct {
 	Page       string
@@ -25,6 +31,7 @@ type PageData struct {
 	Nodes      []models.Node
 	Users      []models.ReturnUser
 	ExtClients []models.ExtClient
+	Version    Version
 }
 
 //Initializes (fetches) page data from backend
@@ -84,7 +91,8 @@ func (data *PageData) Init(page string, c *gin.Context) {
 			data.ExtClients = clients
 		}
 	}
-
+	data.Version.Backend = servercfg.GetVersion()
+	data.Version.Mine = "v0.1.0"
 }
 
 func GetAllExtClients() []models.ExtClient {