Move bindata into app/server package

As additional for this commit: 0ad128d

.gitignore

@@ -3,7 +3,7 @@
 /pkg
 /src/*
 !/src/app
-src/app/server/data/bindata.go
+src/app/server/bindata.go
 src/app/server/data/static/build/
 
 .pid

Makefile

@@ -2,16 +2,16 @@ BIN = $(GOPATH)/bin
 NODE_BIN = $(shell npm bin)
 PID = .pid
 GO_FILES = $(filter-out bindata.go, $(shell find src/app -type f -name "*.go"))
-BINDATA = src/app/server/data/bindata.go
-BINDATA_FLAGS = -pkg=data -prefix=src/app/server/data -ignore=src\\/app\\/server\\/data\\/bindata.go
+BINDATA = src/app/server/bindata.go
+BINDATA_FLAGS = -pkg=server -prefix=src/app/server/data
 BUNDLE = src/app/server/data/static/build/bundle.js
 APP = $(shell find src/app/client -type f)
 
 build: clean $(BIN)/app
 
 clean:
 	@rm -rf src/app/server/data/static/build/*
-	@rm -rf src/app/server/data/bindata.go
+	@rm -rf $(BINDATA)
 	@echo cleaned
 
 $(BUNDLE): $(APP)
@@ -44,6 +44,3 @@ lint:
 	@eslint src/app/client
 	@golint -min_confidence=1 app
 	@golint -min_confidence=1 app/server
-	@golint -min_confidence=1 app/server/api
-	@golint -min_confidence=1 app/server/utils
-	@golint -min_confidence=1 app/server/react

src/app/server/app.go

@@ -1,8 +1,6 @@
 package server
 
 import (
-	"app/server/data"
-
 	"github.com/elazarl/go-bindata-assetfs"
 	"github.com/gin-gonic/gin"
 	"github.com/nu7hatch/gouuid"
@@ -61,8 +59,8 @@ func NewApp(opts ...AppOptions) *App {
 
 	// Define routes and middlewares
 	app.Engine.StaticFS("/static", &assetfs.AssetFS{
-		Asset:    data.Asset,
-		AssetDir: data.AssetDir,
+		Asset:    Asset,
+		AssetDir: AssetDir,
 		Prefix:   "static",
 	})
 

src/app/server/react.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"app/server/data"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -165,7 +164,7 @@ func newDuktapeContext(engine http.Handler) *duktape.Context {
 	vm := duktape.New()
 	vm.PevalString(`var console = {log:print,warn:print,error:print,info:print}`)
 	fetch.Define(vm, engine)
-	app, err := data.Asset("static/build/bundle.js")
+	app, err := Asset("static/build/bundle.js")
 	Must(err)
 	fmt.Println("static/build/bundle.js loaded")
 	if err := vm.PevalString(string(app)); err != nil {