From 2002f2febad1e0fbb14d72899fc3db1791d03734 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sat, 4 Feb 2017 22:30:58 +0800 Subject: [PATCH] Add simple loading indicator --- app/components/loading-spinner/component.js | 7 +++++++ app/components/loading-spinner/template.hbs | 3 +++ app/routes/index.js | 1 - app/styles/app.scss | 1 + app/styles/components/_loading-spinner.scss | 8 ++++++++ app/templates/loading.hbs | 1 + .../components/loading-spinner/component-test.js | 16 ++++++++++++++++ 7 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/components/loading-spinner/component.js create mode 100644 app/components/loading-spinner/template.hbs create mode 100644 app/styles/components/_loading-spinner.scss create mode 100644 app/templates/loading.hbs create mode 100644 tests/integration/components/loading-spinner/component-test.js diff --git a/app/components/loading-spinner/component.js b/app/components/loading-spinner/component.js new file mode 100644 index 0000000..19c8c49 --- /dev/null +++ b/app/components/loading-spinner/component.js @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + + classNames: ['loading-spinner'] + +}); diff --git a/app/components/loading-spinner/template.hbs b/app/components/loading-spinner/template.hbs new file mode 100644 index 0000000..a6458bc --- /dev/null +++ b/app/components/loading-spinner/template.hbs @@ -0,0 +1,3 @@ +

+ Loading data from Ethereum... +

diff --git a/app/routes/index.js b/app/routes/index.js index 4194f31..8d2bc13 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -17,7 +17,6 @@ export default Ember.Route.extend({ kredits: Ember.inject.service(), model() { - return Ember.RSVP.hash({ contributors: this.get('kredits').getContributors() }); diff --git a/app/styles/app.scss b/app/styles/app.scss index 1878099..0aa15ab 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -67,5 +67,6 @@ section { } } +@import "components/loading-spinner"; @import "components/contributor-list"; @import "components/add-contributor"; diff --git a/app/styles/components/_loading-spinner.scss b/app/styles/components/_loading-spinner.scss new file mode 100644 index 0000000..239e3c6 --- /dev/null +++ b/app/styles/components/_loading-spinner.scss @@ -0,0 +1,8 @@ +.loading-spinner { + + margin-top: 14rem; + text-align: center; + font-size: 1.4rem; + color: lightblue; + +} diff --git a/app/templates/loading.hbs b/app/templates/loading.hbs new file mode 100644 index 0000000..7b99811 --- /dev/null +++ b/app/templates/loading.hbs @@ -0,0 +1 @@ +{{loading-spinner}} diff --git a/tests/integration/components/loading-spinner/component-test.js b/tests/integration/components/loading-spinner/component-test.js new file mode 100644 index 0000000..68d1afe --- /dev/null +++ b/tests/integration/components/loading-spinner/component-test.js @@ -0,0 +1,16 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; + +moduleForComponent('loading-spinner', 'Integration | Component | loading spinner', { + integration: true +}); + +test('it renders', function(assert) { + + // Set any properties with this.set('myProperty', 'value'); + // Handle any actions with this.on('myAction', function(val) { ... }); + + this.render(hbs`{{loading-spinner}}`); + + assert.equal(this.$().text().trim(), ''); +});