Finalise the asset embedding

Author: Allan Shone

.gitignore

@@ -3,3 +3,4 @@ node_modules
 dist
 *log
 data/migrate.go
+audiofile/assets.go

Makefile

@@ -5,17 +5,21 @@ bin-migrations:
 	go-bindata -o data/migrate.go -prefix data/migrations/ data/migrations/
 	sed -i "s/package main/package data/" data/migrate.go
 
+bin-dist:
+	go-bindata -o audiofile/assets.go -prefix dist/ dist/...
+
 # at this time, there's no watch enabled for the go binary
-dev-be:
-	go install ./audiofile/ && audiofile
+dev-be: bin-prep bin-migrations bin-dist install
+	audiofile
 
+# serve is a watch task with built-in node server
 dev-fe:
 	yarn serve
 
 install:
 	yarn build
 	go install ./audiofile/
 
-test:
+test: bin-migrations bin-dist install
 	go test -v -race ./...
 

audiofile/handlers.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"net/http"
 	"time"
@@ -47,7 +48,14 @@ func getDirectories(c *gin.Context) {
 }
 
 func root(c *gin.Context) {
-	c.HTML(http.StatusOK, "index.html", gin.H{})
+	r := bytes.NewReader(MustAsset("index.html"))
+	c.DataFromReader(
+		http.StatusOK,
+		int64(len(MustAssetString("index.html"))),
+		"text/html",
+		r,
+		map[string]string{},
+	)
 }
 
 func storeDirectory(c *gin.Context) {

audiofile/server.go

@@ -4,15 +4,29 @@ import (
 	"net/http"
 
 	"github.com/cloudcloud/audiofile/data"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )
 
 func addMiddleware(r *gin.Engine, d *data.Data) *gin.Engine {
-	// TODO: assets, can go when embedded into binary
-	r.LoadHTMLGlob("./dist/*html")
-	r.Static("/js", "./dist/js")
-	r.Static("/css", "./dist/css")
+	r.StaticFS("/js",
+		&assetfs.AssetFS{
+			Asset:     Asset,
+			AssetDir:  AssetDir,
+			AssetInfo: AssetInfo,
+			Prefix:    "js/",
+		},
+	)
+
+	r.StaticFS("/css",
+		&assetfs.AssetFS{
+			Asset:     Asset,
+			AssetDir:  AssetDir,
+			AssetInfo: AssetInfo,
+			Prefix:    "css/",
+		},
+	)
 
 	r.Use(
 		cors.New(cors.Config{

go.mod

@@ -1,6 +1,7 @@
 module github.com/cloudcloud/audiofile
 
 require (
+	github.com/elazarl/go-bindata-assetfs v1.0.0
 	github.com/gin-contrib/cors v0.0.0-20181206035131-7c641a7a7dc5
 	github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect
 	github.com/gin-gonic/gin v1.3.0

go.sum

@@ -29,6 +29,8 @@ github.com/docker/docker v0.7.3-0.20180221142240-453f2b8b40b9/go.mod h1:eEKB0N0r
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
+github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/fsouza/fake-gcs-server v1.3.0/go.mod h1:Lq+43m2znsXfDKHnQMfdA0HpYYAEJsfizsbpk5k3TLo=
 github.com/gin-contrib/cors v0.0.0-20181206035131-7c641a7a7dc5 h1:d4cpoJSg7KnKZ5bdAXqVMMELmmjzvXrPVUvRuj0kHo8=
 github.com/gin-contrib/cors v0.0.0-20181206035131-7c641a7a7dc5/go.mod h1:cw+u9IsAkC16e42NtYYVCLsHYXE98nB3M7Dr9mLSeH4=