Choose contributors from list for new proposals #15

Merged
galfert merged 1 commits from feature/12-new_proposal_contributor_list into master 2017-05-20 16:52:42 +00:00
7 changed files with 61 additions and 9 deletions
Showing only changes of commit f875cd7b91 - Show all commits
+6 -4
View File
@@ -1,9 +1,11 @@
<form {{action "save" on="submit"}}>
<p>
{{input type="text"
placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
value=proposal.recipientAddress
class=(if isValidRecipient 'valid' '')}}
<select required onchange={{action (mut proposal.recipientAddress) value="target.value"}}>
<option value="" selected disabled hidden>Contributor</option>
{{#each contributors as |contributor|}}
<option value={{contributor.address}} selected={{eq proposal.recipientAddress contributor.address}}>{{contributor.github_username}}</option>
{{/each}}
</select>
</p>
<p>
{{input type="text"
+2
View File
@@ -18,6 +18,8 @@ export const queryParams = new QueryParams({
export default Ember.Controller.extend(queryParams.Mixin, {
contributors: null,
actions: {
onSave() {
this.transitionToRoute('index');
+23 -2
View File
@@ -1,15 +1,36 @@
import Ember from 'ember';
import Proposal from 'kredits-web/models/proposal';
export default Ember.Route.extend({
const {
Route,
RSVP,
inject: {
service
}
} = Ember;
export default Route.extend({
kredits: service(),
model(params) {
return Proposal.create({
const proposal = Proposal.create({
recipientAddress: params.recipient,
amount: params.amount,
url: params.url,
ipfsHash: params.ipfsHash
});
return RSVP.hash({
proposal,
contributors: this.get('kredits').getContributors()
});
},
setupController(controller, model) {
this._super(controller, model.proposal);
controller.set('contributors', model.contributors);
}
});
+2 -1
View File
@@ -6,13 +6,14 @@ import Proposal from 'kredits-web/models/proposal';
import kreditsContracts from 'npm:kredits-contracts';
const {
Service,
isPresent,
inject: {
service
}
} = Ember;
export default Ember.Service.extend({
export default Service.extend({
ipfs: service(),
+26 -1
View File
@@ -15,7 +15,7 @@ section#add-contributor, section#add-proposal {
}
}
input[type=text] {
input[type=text], select {
width: 100%;
padding: 1rem;
border: none;
@@ -26,6 +26,31 @@ section#add-contributor, section#add-proposal {
&:focus, &.valid {
background-color: rgba(22, 21, 40, 0.6);
}
@include placeholder {
color: rgba(238, 238, 238, 0.5);
}
}
select {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
border-radius: 0;
background-color: rgba(22, 21, 40, 0.6);
background-image:
linear-gradient(45deg, transparent 50%, gray 50%),
linear-gradient(135deg, gray 50%, transparent 50%);
background-position:
calc(100% - 1.5rem) calc(1rem + 0.5rem),
calc(100% - 1rem) calc(1rem + 0.5rem);
background-size:
0.5rem 0.5rem,
0.5rem 0.5rem;
background-repeat: no-repeat;
&:invalid {
color: rgba(238, 238, 238, 0.5);
}
}
input[type=submit] {
+1 -1
View File
@@ -4,7 +4,7 @@
</header>
<div class="content">
{{add-proposal proposal=model onSave=(action 'onSave')}}
{{add-proposal proposal=model contributors=contributors onSave=(action 'onSave')}}
</div>
</section>
+1
View File
@@ -53,6 +53,7 @@
"ember-load-initializers": "^0.5.1",
"ember-parachute": "0.1.0",
"ember-resolver": "^2.0.3",
"ember-truth-helpers": "1.3.0",
"ipfs-api": "^12.1.7",
"kredits-contracts": "^2.4.0",
"loader.js": "^4.0.10",