refactor assets into fqdn import, main package, move main package to …

…cmd/pendulum
titpetric · Jan 29, 2018 · 8cf36b3 · 8cf36b3
1 parent 636ee5b
commit 8cf36b3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 /build
-/assets
 /test
 /contents
 /pendulum
 /codeship.aes
-/.env
+/.env
+/assets_bindata.go
diff --git a/assets.go b/assets.go
@@ -0,0 +1,3 @@
+package pendulum
+
+//go:generate go-bindata -prefix front/src -o assets_bindata.go -pkg pendulum -nomemcopy front/src/dist/...
diff --git a/git.go → cmd/pendulum/git.go b/git.go → cmd/pendulum/git.go
diff --git a/git_test.go → cmd/pendulum/git_test.go b/git_test.go → cmd/pendulum/git_test.go
diff --git a/main.go → cmd/pendulum/main.go b/main.go → cmd/pendulum/main.go
@@ -10,11 +10,9 @@ import (
 
 	"github.com/elazarl/go-bindata-assetfs"
 
-	"app/assets"
+	"github.com/titpetric/pendulum"
 )
 
-//go:generate go-bindata -prefix front/src -o assets/bindata.go -pkg assets -nomemcopy front/src/dist/...
-
 // Serves index.html in case the requested file isn't found (or some other os.Stat error)
 func serveIndex(serve http.Handler, fs assetfs.AssetFS) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -72,9 +70,9 @@ func main() {
 
 	assetPrefix := "dist"
 	assets := assetfs.AssetFS{
-		assets.Asset,
-		assets.AssetDir,
-		assets.AssetInfo,
+		pendulum.Asset,
+		pendulum.AssetDir,
+		pendulum.AssetInfo,
 		assetPrefix,
 	}
 	server := http.FileServer(&assets)

diff --git a/main_api.go → cmd/pendulum/main_api.go b/main_api.go → cmd/pendulum/main_api.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package pendulum

		//go:generate go-bindata -prefix front/src -o assets_bindata.go -pkg pendulum -nomemcopy front/src/dist/...