Merge branch 'release/2.16.1'

getslash · Apr 7, 2019 · 95856fb · 95856fb
2 parents 81aa4f5 + e97e0ba
commit 95856fb
Show file tree

Hide file tree

Showing 42 changed files with 336 additions and 1,166 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 2.16.1
+
+* UI fixes and corrections
+
 ## Version 2.16.0
 
 * Major UI overhaul

diff --git a/Makefile b/Makefile
@@ -7,5 +7,5 @@ testdb:
  pipenv run manage db upgrade
 
 clean:
- rm -rf .env webapp/tmp/ webapp/node_modules/ webapp/bower_components/ static
+ rm -rf .env webapp/tmp/ webapp/node_modules/ static
  find . -name "*.pyc" -delete
diff --git a/_lib/frontend.py b/_lib/frontend.py
@@ -12,7 +12,6 @@
 
 _NPM_PREFIX = from_project_root('.env/npm')
 _EMBER_EXECUTABLE = os.path.join(_NPM_PREFIX, 'bin', 'ember')
-_BOWER_EXECUTABLE = os.path.join(_NPM_PREFIX, 'bin', 'bower')
 
 _logger = logbook.Logger(__name__)
 
@@ -49,9 +48,8 @@ def _bootstrap_frontend():
  from_env("frontend.timestamp"), ["webapp/package.json"]) as uptodate:
  if not uptodate:
  _logger.info("Bootstrapping frontend environment...")
- _execute("npm install -g ember-cli bower")
+ _execute("npm install -g ember-cli")
  _execute("npm install")
- _execute("{} install --allow-root".format(_BOWER_EXECUTABLE))
 
 @contextmanager
 def _get_timestamp_update_context(timestamp_path, paths):

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,9 +1,9 @@
 FROM node:8 as frontend-builder
 # build frontend
-RUN npm install -g ember-cli bower
+RUN npm install -g ember-cli
 
 ADD ./webapp/ /frontend/
-RUN cd /frontend/ && yarn install && bower install --allow-root
+RUN cd /frontend/ && yarn install
 RUN cd /frontend/ && node_modules/.bin/ember build --environment production
 
 FROM ekidd/rust-musl-builder:stable as rust-builder

diff --git a/webapp/.bowerrc b/webapp/.bowerrc
diff --git a/webapp/app/application/template.hbs b/webapp/app/application/template.hbs
@@ -27,7 +27,6 @@
  {{#nav.dropdown as |dd|}}
  {{#dd.toggle}}Debug{{/dd.toggle}}
  {{#dd.menu as |ddm|}}
- {{#ddm.item}}{{#ddm.link-to "component-proofing"}}Component Proofing{{/ddm.link-to}}{{/ddm.item}}
  {{#ddm.item}}<a href="/styleguide" class="dropdown-item">Style Guide...</a>{{/ddm.item}}
  {{/dd.menu}}
  {{/nav.dropdown}}

diff --git a/webapp/app/component-proofing/controller.js b/webapp/app/component-proofing/controller.js
diff --git a/webapp/app/component-proofing/route.js b/webapp/app/component-proofing/route.js