diff --git a/Makefile b/Makefile index 0edee9ab..fb682b63 100644 --- a/Makefile +++ b/Makefile @@ -106,11 +106,11 @@ website: $(HUGO) hugo serve --source=website/ ui: - yarn --cwd ui install - yarn --cwd ui build + npm --prefix=ui install + npm --prefix=ui run build ui-dev: - yarn --cwd ui serve + npm --prefix=ui run dev ui-client: @rm -rf $(CURDIR)/ui/src/client diff --git a/ui/.gitignore b/ui/.gitignore index f6c6c161..3261cfc7 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -12,8 +12,6 @@ node_modules # Log files npm-debug.log* -yarn-debug.log* -yarn-error.log* # Editor directories and files .idea diff --git a/ui/README.md b/ui/README.md index 1ec94284..8ab0a205 100644 --- a/ui/README.md +++ b/ui/README.md @@ -1,34 +1,13 @@ # ui ## Project setup -``` -yarn install -``` -### Compiles and hot-reloads for development -``` -yarn run serve -``` - -### Compiles and minifies for production -``` -yarn run build -``` + npm install -### Run your tests -``` -yarn run test -``` +### Compiles and hot-reloads for development -### Lints and fixes files -``` -yarn run lint -``` + npm run dev -### Run your unit tests -``` -yarn run test:unit -``` +### Compiles and minifies for production -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). + npm run build diff --git a/ui/public/index.html b/ui/index.html similarity index 58% rename from ui/public/index.html rename to ui/index.html index c960401b..03423835 100644 --- a/ui/public/index.html +++ b/ui/index.html @@ -4,11 +4,12 @@ - - - - + + + + Enduro +