From d171d0c741f48365ba971f147152da6aead07b34 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sun, 5 Feb 2017 17:01:19 +0800 Subject: [PATCH] Hide proposals from non-Ethereum visitors --- app/components/proposal-list/template.hbs | 1 + app/models/proposal.js | 1 + app/services/kredits.js | 1 + app/styles/components/_proposal-list.scss | 4 +++ app/templates/index.hbs | 30 +++++++++++------------ 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/app/components/proposal-list/template.hbs b/app/components/proposal-list/template.hbs index 7602e88..39c3727 100644 --- a/app/components/proposal-list/template.hbs +++ b/app/components/proposal-list/template.hbs @@ -1,5 +1,6 @@ {{#each proposals as |proposal|}}
  • + #{{proposal.id}} Issue{{#if proposal.executed}}d{{/if}} {{proposal.amount}}₭S to {{proposal.recipientName}} diff --git a/app/models/proposal.js b/app/models/proposal.js index 27cd21f..489b228 100644 --- a/app/models/proposal.js +++ b/app/models/proposal.js @@ -2,6 +2,7 @@ import Ember from 'ember'; export default Ember.Object.extend({ + id: null, creator: null, recipient: null, votesCount: null, diff --git a/app/services/kredits.js b/app/services/kredits.js index d959f84..7c8b80f 100644 --- a/app/services/kredits.js +++ b/app/services/kredits.js @@ -87,6 +87,7 @@ export default Ember.Service.extend({ let promise = new Ember.RSVP.Promise((resolve, reject) => { this.getValueFromContract('proposals', i).then(p => { let proposal = Proposal.create({ + id : i, creatorAddress : p[0], recipientAddress : p[1], votesCount : p[2].toNumber(), diff --git a/app/styles/components/_proposal-list.scss b/app/styles/components/_proposal-list.scss index 727b253..a4388be 100644 --- a/app/styles/components/_proposal-list.scss +++ b/app/styles/components/_proposal-list.scss @@ -14,6 +14,10 @@ ul.proposal-list { border-top: 1px solid rgba(255,255,255,0.2); } + .id { + color: lightblue; + padding-right: 0.2rem; + } .amount { font-weight: 500; } diff --git a/app/templates/index.hbs b/app/templates/index.hbs index b50049f..150f90b 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -13,27 +13,27 @@ -{{#if proposalsOpen}} -
    +{{#if contractInteractionEnabled}} + {{#if proposalsOpen}} +
    +
    +

    Open Proposals

    +
    +
    + {{proposal-list proposals=proposalsOpen}} +
    +
    + {{/if}} + +
    -

    Open Proposals

    +

    Closed Proposals

    - {{proposal-list proposals=proposalsOpen}} + {{proposal-list proposals=proposalsClosed}}
    -{{/if}} -
    -
    -

    Closed Proposals

    -
    -
    - {{proposal-list proposals=proposalsClosed}} -
    -
    - -{{#if contractInteractionEnabled}}

    Add Contributor