ui: moved chart and introduced dev mode

cmd/ev/ev.go

@@ -9,11 +9,11 @@ import (
 
 	"gbbr.io/ev"
 	"gbbr.io/ev/ui"
-	assetfs "github.com/elazarl/go-bindata-assetfs"
 	"github.com/pkg/browser"
 )
 
 var funcName, fileName string
+var parsedLog []*ev.Commit
 
 func init() {
 	log.SetFlags(0)
@@ -33,28 +33,21 @@ func usageAndExit() {
 	os.Exit(0)
 }
 
-func newServeMux() *http.ServeMux {
-	mux := http.NewServeMux()
-	mux.Handle("/dist/", http.StripPrefix("/dist/", http.FileServer(&assetfs.AssetFS{
-		Asset:     ui.Asset,
-		AssetDir:  ui.AssetDir,
-		AssetInfo: ui.AssetInfo,
-		Prefix:    "",
-	})))
-	return mux
+func index(w http.ResponseWriter, req *http.Request) {
+	if err := indexTemplate.Execute(w, parsedLog); err != nil {
+		log.Fatal(err)
+	}
 }
 
 func main() {
-	parsedLog, err := ev.Log(funcName, fileName)
+	var err error
+	parsedLog, err = ev.Log(funcName, fileName)
 	if err != nil {
 		log.Fatal(err)
 	}
-	mux := newServeMux()
-	mux.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
-		if err := indexTemplate.Execute(w, parsedLog); err != nil {
-			log.Fatal(err)
-		}
-	})
+	mux := http.NewServeMux()
+	mux.Handle("/dist/", http.StripPrefix("/dist/", http.FileServer(ui.FS)))
+	mux.HandleFunc("/", index)
 	go func() {
 		if err := http.ListenAndServe(":8888", mux); err != nil {
 			log.Fatal(err)

ui/gen.go → ui/fs.go

@@ -1,24 +1,18 @@
+// +build !dev
+
 // Package ui generates binary data from the files inside the dist/ folder
 // to be included into the final binary, or to be served during development.
 package ui // import "gbbr.io/ev/ui"
 
+import assetfs "github.com/elazarl/go-bindata-assetfs"
+
 //go:generate webpack --display=errors-only
 //go:generate go-bindata -o bindata.go -prefix=dist/ -pkg ui dist/
 
-import (
-	"log"
-	"os"
-	"path/filepath"
-)
-
-// rootDir will hold the full path of the dist/ file server. It is used by
-// go-bindata in -dev mode.
-var rootDir string
-
-func init() {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatalf("getwd: %v", err)
-	}
-	rootDir = filepath.Join(wd, "ui", "dist")
+// FS serves the binary embedded http.Filesystem.
+var FS = &assetfs.AssetFS{
+	Asset:     Asset,
+	AssetDir:  AssetDir,
+	AssetInfo: AssetInfo,
+	Prefix:    "",
 }

ui/fs_dev.go

@@ -0,0 +1,8 @@
+// +build dev
+
+package ui
+
+import "net/http"
+
+// FS serves the actual files from the local folder in dev mode.
+var FS = http.Dir("ui/dist/")

ui/src/sidePanel.js

@@ -71,9 +71,9 @@ class SidePanel extends Component {
                         Committer: {entry.CommitterName} <{entry.CommitterEmail}>
                          {moment(entry.CommitterDate).fromNow()}
                     </div>
-                    <div className="txt"><pre>{entry.Msg}</pre></div>
                 </div>
                 <div id="chart" />
+                <div className="txt"><pre>{entry.Msg}</pre></div>
             </div>
         );
     }

ui/src/styles.css

@@ -20,11 +20,11 @@ body {
 	opacity: 0.8;
 	border: 1px solid gray;
 	padding: 10px;
-	user-select: none;
 }
 
 .panel .nav {
 	margin-bottom: 10px;
+	user-select: none;
 }
 
 .panel .nav a {
@@ -44,6 +44,11 @@ body {
 	display: none;
 }
 
+.panel #chart {
+	height: 150px;
+	margin: 15px 0;
+}
+
 a {
 	cursor: pointer;
 	color: #07c;