Embed web view templates to the binary

skroutz · Apr 18, 2018 · 5b67989 · 5b67989
1 parent 13b2c46
commit 5b67989
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,10 @@
 *.prof
 *.pyc
 
-config.json
-fabfile.py
-
 /mistry
 /mistryd
 
+cmd/mistryd/statik
+config.json
+fabfile.py
 vendor/
diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ install: fmt test
 build: mistryd mistry
 
 mistryd:
+	go generate ./...
 	$(BUILDCMD) -o $(SERVER) cmd/mistryd/*.go
 
 mistry:

diff --git a/cmd/mistryd/Gopkg.lock b/cmd/mistryd/Gopkg.lock
diff --git a/cmd/mistryd/Gopkg.toml b/cmd/mistryd/Gopkg.toml
@@ -33,3 +33,7 @@
 [[constraint]]
   name = "github.com/urfave/cli"
   version = "1.20.0"
+
+[[constraint]]
+  name = "github.com/rakyll/statik"
+  version = "0.1.1"
diff --git a/public/css/foundation.min.css → cmd/mistryd/public/css/foundation.min.css b/public/css/foundation.min.css → cmd/mistryd/public/css/foundation.min.css
diff --git a/public/index.html → cmd/mistryd/public/index.html b/public/index.html → cmd/mistryd/public/index.html
diff --git a/public/js/index.js → cmd/mistryd/public/js/index.js b/public/js/index.js → cmd/mistryd/public/js/index.js
diff --git a/public/templates/show.html → cmd/mistryd/public/templates/show.html b/public/templates/show.html → cmd/mistryd/public/templates/show.html
diff --git a/cmd/mistryd/server.go b/cmd/mistryd/server.go
@@ -1,3 +1,4 @@
+//go:generate statik -src=./public -f
 package main
 
 import (
@@ -16,8 +17,8 @@ import (
 
 	"sync"
 
-	"github.com/alecthomas/template"
-
+	"github.com/rakyll/statik/fs"
+	_ "github.com/skroutz/mistry/cmd/mistryd/statik"
 	"github.com/skroutz/mistry/pkg/broker"
 	"github.com/skroutz/mistry/pkg/tailer"
 	"github.com/skroutz/mistry/pkg/types"
@@ -56,7 +57,13 @@ func NewServer(cfg *Config, logger *log.Logger) (*Server, error) {
 
 	s := new(Server)
 	mux := http.NewServeMux()
-	mux.Handle("/", http.StripPrefix("/", http.FileServer(http.Dir("public"))))
+
+	statikFS, err := fs.New()
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	mux.Handle("/", http.StripPrefix("/", http.FileServer(statikFS)))
 	mux.HandleFunc("/jobs", s.HandleNewJob)
 	mux.HandleFunc("/index/", s.HandleIndex)
 	mux.HandleFunc("/job/", s.HandleShowJob)