diff --git a/.gitignore b/.gitignore index b1be543..9115ebc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ config.yaml mydb.sql +client/calls/ +!client/calls/.gitkeep /gordio /calls Session.vim diff --git a/Makefile b/Makefile index 1d685d1..a0ce208 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,16 @@ all: + @[ ! -e client/calls/index.html ] && make getcalls go build -o gordio ./cmd/gordio/ go build -o calls ./cmd/calls/ +clean: + rm -rf client/calls/ && mkdir client/calls && touch client/calls/.gitkeep + rm -f gordio calls + +getcalls: + rm -rf client/calls/* + cd client/calls/ && curl -OL https://nightly.link/amigan/calls/workflows/build-web/trunk/webBuild.zip && unzip -o webBuild.zip && rm webBuild.zip + generate: sqlc generate -f sql/sqlc.yaml protoc -I=pkg/pb/ --go_out=pkg/ pkg/pb/stillbox.proto diff --git a/client/client.go b/client/client.go index 78300c1..23281d9 100644 --- a/client/client.go +++ b/client/client.go @@ -4,4 +4,5 @@ import ( "embed" ) +//go:embed calls var Calls embed.FS diff --git a/pkg/gordio/server/routes.go b/pkg/gordio/server/routes.go index f5ffb23..aba090a 100644 --- a/pkg/gordio/server/routes.go +++ b/pkg/gordio/server/routes.go @@ -15,7 +15,7 @@ import ( ) func (s *Server) setupRoutes() { - clientRoot, err := fs.Sub(client.Calls, "calls/build/web") + clientRoot, err := fs.Sub(client.Calls, "calls") if err != nil { panic(err) }