status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-16 15:47:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixes the static asset generator for new pkg path, updates assets.

Browse Source
This commit is contained in:
James Phillips 2016-01-15 10:21:42 -08:00
parent 8683896465
commit f24a044755
5 changed files with 85 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -72,7 +72,7 @@ generate: deps
# generates the static web ui # generates the static web ui
static-assets: deps static-assets: deps
@echo "--> Generating static assets" @echo "--> Generating static assets"
@go-bindata-assetfs -pkg agent -prefix ui ./ui/dist/... @go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
@mv bindata_assetfs.go command/agent @mv bindata_assetfs.go command/agent
$(MAKE) format $(MAKE) format

185
command/agent/bindata_assetfs.go
View File

File diff suppressed because one or more lines are too long

4
ui/README.md
View File

@ -56,7 +56,7 @@ development configuration.
`make dist` `make dist`
The `dist` folder will contain the files you should use for deployment. The `../pkg/web_ui` folder will contain the files you should use for deployment.
###Acknowledgements ###Acknowledgements
cog icon by useiconic.com from the [Noun Project](https://thenounproject.com/term/setting/45865/) cog icon by useiconic.com from the [Noun Project](https://thenounproject.com/term/setting/45865/)
@ -67,7 +67,7 @@ The UI is compiled and shipped with the Consul go binary. The generated bindata
file lives in the `command/agent/bindata_assetfs.go` file and is checked into file lives in the `command/agent/bindata_assetfs.go` file and is checked into
source control. This is useful so that not every Consul developer needs to set source control. This is useful so that not every Consul developer needs to set
up bundler etc. To re-generate the file, first follow the compilation steps up bundler etc. To re-generate the file, first follow the compilation steps
above to build the UI assets into the `dist/` folder. With that done, from the above to build the UI assets into the `pkg/web_ui` folder. With that done, from the
root of the Consul repo, run: root of the Consul repo, run:
``` ```

0
ui/dist/.gitkeep vendored
View File