kredits/kredits-web
9
0
Fork 0
Code Issues 23 Pull Requests 1 Actions Releases 18 Activity

Add account badge #31

Merged
bumi merged 4 commits from feature/account-badge into master 2018-04-06 15:54:54 +00:00
Conversation 3 Commits 4 Files Changed 2
+16 -16
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 499b22af15 - Show all commits
app/services/kredits.js
+8 -8
View File
@@ -7,6 +7,7 @@ import Ember from 'ember';
import Service from 'ember-service';
import injectService from 'ember-service/inject';
import computed, { alias } from 'ember-computed';
import { isEmpty, isPresent } from 'ember-utils';
import config from 'kredits-web/config/environment';
import Proposal from 'kredits-web/models/proposal';
3
 @@ -32,14 +33,14 @@ export default Service.extend({
currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
currentUser: null,
currentUserIsContributor: computed('currentUser', function() {
return Ember.isPresent(this.get('currentUser'));
return isPresent(this.get('currentUser'));
}),
currentUserIsCore: alias('currentUser.isCore'),
hasAccounts: computed('currentUserAccounts', function() {
return !Ember.isEmpty(this.get('currentUserAccounts'));
return !isEmpty(this.get('currentUserAccounts'));
}),
accountNeedsUnlock: computed('currentUserAccounts', function() {
return this.get('currentUserAccounts') && Ember.isEmpty(this.get('currentUserAccounts'));
return this.get('currentUserAccounts') && isEmpty(this.get('currentUserAccounts'));
}),
// this is called called in the routes beforeModel(). So it is initialized before everything else
6
 @@ -293,17 +294,16 @@ export default Service.extend({
},
getCurrentUser: computed('ethProvider', function() {
if (Ember.isEmpty(this.get('currentUserAccounts'))) {
return Ember.RSVP.resolve();
if (isEmpty(this.get('currentUserAccounts'))) {
return RSVP.resolve();
}
return this.get('contributorsContract')
.then((contract) => {
console.log('user accounts', this.get('currentUserAccounts')[0]);
return contract.getContributorIdByAddress(this.get('currentUserAccounts')[0])
return contract.getContributorIdByAddress(this.get('currentUserAccounts.firstObject'))
.then((id) => {
// check if the user is a contributor or not
if( id.toNumber() === 0) {
return Ember.RSVP.resolve();
return RSVP.resolve();
} else {
return this.getContributorData(id.toNumber());
}
app/templates/index.hbs
+8 -8
View File
@@ -1,13 +1,13 @@
{{#if kredits.hasAccounts }}
fsmanuel commented 2018-04-06 15:18:33 +00:00 (Migrated from github.com)
Review
Copy Link
Copy Source

I would indent it like this:

{{#if kredits.hasAccounts }}
  <section id="user-account">
    {{!-- ... --}}
  </section>
{{/if}}
I would indent it like this: ```hbs {{#if kredits.hasAccounts }} <section id="user-account"> {{!-- ... --}} </section> {{/if}} ```
<section id="user-account">
{{#if kredits.currentUser }}
{{ kredits.currentUser.name }}
{{#if kredits.currentUserIsCore }}
(core)
<section id="user-account">
{{#if kredits.currentUser }}
{{ kredits.currentUser.name }}
{{#if kredits.currentUserIsCore }}
(core)
{{/if}}
Account: {{kredits.currentUser.address}}
{{/if}}
Account: {{kredits.currentUser.address}}
{{/if}}
</section>
</section>
{{/if}}
<section id="contributors">