From 6a31b0d57931e2629f0e92ec19ff5004a1a3078e Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Mon, 2 Apr 2018 19:07:42 +0200 Subject: [PATCH] Rename contributor.kredits to .balance --- app/components/contributor-list/template.hbs | 2 +- app/controllers/index.js | 12 ++++++------ app/models/contributor.js | 2 +- tests/unit/controllers/index-test.js | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/components/contributor-list/template.hbs b/app/components/contributor-list/template.hbs index ab6c0f2..f061463 100644 --- a/app/components/contributor-list/template.hbs +++ b/app/components/contributor-list/template.hbs @@ -6,7 +6,7 @@ {{contributor.name}} - {{contributor.kredits}} + {{contributor.balance}} ₭S diff --git a/app/controllers/index.js b/app/controllers/index.js index 96c3b54..508005d 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -40,11 +40,11 @@ export default Ember.Controller.extend({ contributorsWithKredits: function() { return this.get('model.contributors').filter(c => { - return c.get('kredits') !== 0; + return c.get('balance') !== 0; }); - }.property('model.contributors.@each.kredits'), + }.property('model.contributors.@each.balance'), - contributorsSorting: ['kredits:desc'], + contributorsSorting: ['balance:desc'], contributorsSorted: Ember.computed.sort('contributorsWithKredits', 'contributorsSorting'), watchContractEvents: function() { @@ -112,7 +112,7 @@ export default Ember.Controller.extend({ this.get('model.contributors') .findBy('address', data.args.recipient) - .incrementProperty('kredits', data.args.amount.toNumber()); + .incrementProperty('balance', data.args.amount.toNumber()); }, _handleProposalVoted(data) { @@ -124,10 +124,10 @@ export default Ember.Controller.extend({ _handleTransfer(data) { this.get('model.contributors') .findBy('address', data.args.from) - .incrementProperty('kredits', - data.args.value.toNumber()); + .incrementProperty('balance', - data.args.value.toNumber()); this.get('model.contributors') .findBy('address', data.args.to) - .incrementProperty('kredits', data.args.value.toNumber()); + .incrementProperty('balance', data.args.value.toNumber()); }, diff --git a/app/models/contributor.js b/app/models/contributor.js index 7c69f2d..a6b9532 100644 --- a/app/models/contributor.js +++ b/app/models/contributor.js @@ -14,7 +14,7 @@ export default Ember.Object.extend({ github_uid: null, wiki_username: null, profileHash: null, - kredits: null, + balance: null, isCore: false, isCurrentUser: false, diff --git a/tests/unit/controllers/index-test.js b/tests/unit/controllers/index-test.js index ca30faa..c98dfb5 100644 --- a/tests/unit/controllers/index-test.js +++ b/tests/unit/controllers/index-test.js @@ -18,16 +18,16 @@ let addFixtures = function(controller) { }); [ - { github_username: "neo", github_uid: "318", kredits: 10000 }, - { github_username: "morpheus", github_uid: "843", kredits: 15000 }, - { github_username: "trinity", github_uid: "123", kredits: 5000 }, - { github_username: "mouse", github_uid: "696", kredits: 0 } + { github_username: "neo", github_uid: "318", balance: 10000 }, + { github_username: "morpheus", github_uid: "843", balance: 15000 }, + { github_username: "trinity", github_uid: "123", balance: 5000 }, + { github_username: "mouse", github_uid: "696", balance: 0 } ].forEach(fixture => { controller.get('model.contributors').push(Contributor.create(fixture)); }); }; -test('doesn\'t contain people with 0 kredits', function(assert) { +test('doesn\'t contain people with 0 balance', function(assert) { let controller = this.subject(); addFixtures(controller);