Skip to content

Commit

Permalink
ui: update ember, dist steps
Browse files Browse the repository at this point in the history
  • Loading branch information
pearkes committed May 1, 2014
1 parent f820c5e commit 936fa02
Show file tree
Hide file tree
Showing 7 changed files with 370 additions and 130 deletions.
6 changes: 6 additions & 0 deletions ui/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# A sample Gemfile
source "https://rubygems.org"

gem "uglifier"
gem "sass"
gem "therubyracer"
22 changes: 22 additions & 0 deletions ui/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
GEM
remote: https://rubygems.org/
specs:
execjs (2.0.2)
json (1.8.1)
libv8 (3.16.14.3)
ref (1.0.5)
sass (3.3.6)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)

PLATFORMS
ruby

DEPENDENCIES
sass
therubyracer
uglifier
10 changes: 7 additions & 3 deletions ui/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ server:
watch:
sass styles:static --watch

build:
sass styles/base.scss static/base.css
dist:
@echo "compile styles/*.scss"
@sass styles/base.scss static/base.css
@ruby scripts/compile.rb
cp -R ./static dist/static
cp index.html dist/

.PHONY: server watch build
.PHONY: server watch dist
17 changes: 10 additions & 7 deletions ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,11 @@ performance and usability.

Improvements and bug fixes are welcome and encouraged for the Web UI.

The UI is built with SASS CSS, so you'll need to compile that through
the associated makefile, as well as installing the `sass` gem.
You'll need sass to compile CSS stylesheets. Install that with
bundler:

gem install sass

One-time stylesheet compilation:

make build
cd ui/
bundle

Reloading compilation for development:

Expand All @@ -47,3 +44,9 @@ An example of this command, from inside the `ui/` directory, would be:

consul agent -bootstrap -server -data-dir /tmp/ -ui-dir .


### Releasing

These steps are slightly manual at the moment.

1. Build with `make dist`
3 changes: 1 addition & 2 deletions ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -403,15 +403,14 @@ <h3 class="panel-title">

<script src="javascripts/libs/jquery-1.10.2.js"></script>
<script src="javascripts/libs/handlebars-1.1.2.js"></script>
<script src="javascripts/libs/ember-1.5.0.js"></script>
<script src="javascripts/libs/ember-1.5.1.js"></script>
<script src="javascripts/libs/ember-validations.js"></script>
<script src="javascripts/fixtures.js"></script>
<script src="javascripts/app/router.js"></script>
<script src="javascripts/app/routes.js"></script>
<script src="javascripts/app/models.js"></script>
<script src="javascripts/app/views.js"></script>
<script src="javascripts/app/controllers.js"></script>

<!-- to activate the test runner, add the "?test" query string parameter -->
<script src="tests/runner.js"></script>
</body>
Expand Down
Loading

0 comments on commit 936fa02

Please sign in to comment.