update web UI

robaho · robaho · commit 018579926c07 · 2020-01-23T01:27:59.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,2 @@
-# Binaries for programs and plugins
-*.exe
-*.dll
-*.so
-*.dylib
-
-# Test binary, build with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
-.glide/
-.idea/
-*.swp
+node_modules
+out
diff --git a/internal/exchange/webserver.go b/internal/exchange/webserver.go
@@ -194,7 +194,7 @@ func bookToJSON(symbol string, book *Book) []byte {
 	return msg
 }
 
-func statsToJSON(symbol string, stats *Statistics) []byte {
+func statsToJSON(stats *Statistics) []byte {
 	msg, _, _ := websocket.JSON.Marshal(*stats)
 	return msg
 }
@@ -272,7 +272,7 @@ func apiStatsHandler(w http.ResponseWriter, r *http.Request) {
 		if stats == nil {
 			stats = &Statistics{}
 		}
-		s := statsToJSON(symbol, stats)
+		s := statsToJSON(stats)
 		w.Write(s)
 	}
 }
diff --git a/web/assets/css/common.css b/web/assets/css/common.css
@@ -0,0 +1,22 @@
+table {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+}
+
+table td, table th {
+    border: 1px solid #ddd;
+    padding: 8px;
+}
+
+table tr:nth-child(even){background-color: #f2f2f2;}
+
+table tr:hover {background-color: #ddd;}
+
+table th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    background-color: darkslategray;
+    color: white;
+}
diff --git a/web/templates/instruments.html b/web/templates/instruments.html
@@ -3,30 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>GOT Exchange Web Interface</title>
-    <style>
-        table {
-            font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-            border-collapse: collapse;
-            width: 100%;
-        }
-
-        table td, table th {
-            border: 1px solid #ddd;
-            padding: 8px;
-        }
-
-        table tr:nth-child(even){background-color: #f2f2f2;}
-
-        table tr:hover {background-color: #ddd;}
-
-        table th {
-            padding-top: 12px;
-            padding-bottom: 12px;
-            text-align: left;
-            background-color: darkslategray;
-            color: white;
-        }
-    </style>
+    <link rel="stylesheet" type="text/css" href="/assets/css/common.css">
 </head>
 <body>
 Welcome to the GOT web interface...<br>

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func bookToJSON(symbol string, book *Book) []byte {`
`194`	`194`	`return msg`
`195`	`195`	`}`
`196`	`196`
`197`		`-func statsToJSON(symbol string, stats *Statistics) []byte {`
	`197`	`+func statsToJSON(stats *Statistics) []byte {`
`198`	`198`	`msg, _, _ := websocket.JSON.Marshal(*stats)`
`199`	`199`	`return msg`
`200`	`200`	`}`
`@@ -272,7 +272,7 @@ func apiStatsHandler(w http.ResponseWriter, r *http.Request) {`
`272`	`272`	`if stats == nil {`
`273`	`273`	`stats = &Statistics{}`
`274`	`274`	`}`
`275`		`- s := statsToJSON(symbol, stats)`
	`275`	`+ s := statsToJSON(stats)`
`276`	`276`	`w.Write(s)`
`277`	`277`	`}`
`278`	`278`	`}`