Show contribution history from events

.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "analytics": false
+}

.editorconfig

@@ -4,6 +4,7 @@
 
 root = true
 
+
 [*]
 end_of_line = lf
 charset = utf-8

.ember-cli

@@ -5,5 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": true
+  "disableAnalytics": false
 }

.eslintignore

@@ -1,21 +0,0 @@
-# unconventional js
-/blueprints/*/files/
-/vendor/
-
-# compiled output
-/dist/
-/tmp/
-/release/
-
-# dependencies
-/bower_components/
-/node_modules/
-
-# misc
-/coverage/
-!.*
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

.eslintrc.js

@@ -1,77 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  parser: '@babel/eslint-parser',
-  parserOptions: {
-    requireConfigFile: false,
-    ecmaVersion: 2020,
-    sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true
-    },
-    babelOptions: {
-      babelrc: false,
-      configFile: false,
-      plugins: [
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-      ],
-    },
-  },
-  globals: {
-    console: true
-  },
-  plugins: [
-    'ember'
-  ],
-  extends: [
-    'eslint:recommended',
-    'plugin:ember/recommended'
-  ],
-  env: {
-    browser: true
-  },
-  rules: {
-    'ember/avoid-leaking-state-in-ember-objects': 'warn',
-    'no-console': 'off',
-    'ember/no-jquery': 'error',
-    'ember/require-computed-property-dependencies': 'warn',
-    'ember/no-computed-properties-in-native-classes': 'warn',
-    'ember/no-observers': 'warn',
-    'ember/no-classic-classes': 'warn',
-    'ember/no-classic-components': 'warn',
-    'ember/no-controller-access-in-routes': 'warn',
-    'ember/no-actions-hash': 'warn',
-    'ember/require-tagless-components': 'warn'
-  },
-  overrides: [
-    // node files
-    {
-      files: [
-        '.eslintrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'lib/*/index.js',
-        'server/**/*.js'
-      ],
-      parserOptions: {
-        sourceType: 'script'
-      },
-      env: {
-        browser: false,
-        node: true
-      },
-      plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-
-        // this can be removed once the following is fixed
-        // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off'
-      })
-    }
-  ]
-};

.github/release-drafter.yml

@@ -1,4 +0,0 @@
-template: |
-  ## Changes
-
-  $CHANGES

.gitignore

@@ -1,26 +1,17 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist/
+/dist
-/tmp/
+/tmp
 
 # dependencies
-/bower_components/
+/node_modules
-/node_modules/
+/bower_components
 
 # misc
-/.env*
-/.pnp*
 /.sass-cache
 /connect.lock
-/coverage/
+/coverage/*
 /libpeerconnection.log
-/npm-debug.log*
+npm-debug.log*
-/testem.log
+testem.log
-/yarn-error.log
-.tm_properties
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

.jshintrc

@@ -0,0 +1,32 @@
+{
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "devel": true,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": false,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": false,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": false,
+  "eqnull": true,
+  "esversion": 6,
+  "unused": true
+}

.template-lintrc.js

@@ -1,100 +0,0 @@
-'use strict';
-
-module.exports = {
-  extends: 'octane',
-
-  rules: {
-    'simple-unless': false,
-    'no-nested-interactive': false,
-    'no-html-comments': false
-  },
-
-  ignore: [
-    'kredits-web/templates/components/**',
-    'app/templates/components/**'
-  ],
-
-	pending: [
-		{
-			"moduleId": "app/templates/dashboard",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/components/add-contribution/template",
-			"only": [
-				"no-action",
-				"no-curly-component-invocation"
-			]
-		},
-		{
-			"moduleId": "app/components/add-contributor/template",
-			"only": [
-				"no-action",
-				"no-curly-component-invocation"
-			]
-		},
-		{
-			"moduleId": "app/components/contribution-list/template",
-			"only": [
-				"no-action",
-				"no-curly-component-invocation"
-			]
-		},
-		{
-			"moduleId": "app/components/contributor-list/template",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/components/expense-list/template",
-			"only": [
-				"no-invalid-role"
-			]
-		},
-		{
-			"moduleId": "app/components/topbar-account-panel/template",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/templates/contributions/new",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/templates/contributions/resubmit",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/templates/contributors/edit",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/templates/contributors/new",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/templates/signup/eth-account",
-			"only": [
-				"no-action"
-			]
-		},
-		{
-			"moduleId": "app/templates/signup/index",
-			"only": [
-				"no-action"
-			]
-		}
-	]
-};

.travis.yml

@@ -1,21 +1,25 @@
 ---
 language: node_js
 node_js:
-  - "14"
+  - "6"
-  - "16"
 
 sudo: false
-dist: precise
-
-notifications:
-  email: false
-
-addons:
-  chrome: stable
 
 cache:
-  npm: false
+  directories:
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
-branches:
+before_install:
-  only:
+  - npm config set spin false
-    - master
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+
+install:
+  - npm install
+  - bower install
+
+script:
+  - npm test

README.md

@@ -5,46 +5,37 @@
 This README outlines the details of collaborating on this Ember application.
 A short introduction of this app could easily go here.
 
-## Development
+## Prerequisites
-
-### Prerequisites
 
 You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/) (with npm)
+* [Node.js](https://nodejs.org/) (with NPM)
+* [Bower](https://bower.io/)
 * [Ember CLI](https://ember-cli.com/)
-* [Google Chrome](https://google.com/chrome/) (only for running tests)
+* [PhantomJS](http://phantomjs.org/)
 
-### Installation
+## Installation
 
-* `git clone git@github.com:67P/kredits-web.git` this repository
+* `git clone <repository-url>` this repository
 * `cd kredits-web`
 * `npm install`
+* `bower install`
 
-### Building/running for development
+## Running / Development
 
-* `ember serve` - by default kredits-web connects to the Ethreum Kovan network
+* `ember serve`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
-* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
-See [working with locally deployed contracts](https://github.com/67P/kredits-web#working-with-locally-deployed-contracts) for details on how to develop with locally deployed contracts.
+### Code Generators
-
-### Code generators
 
 Make use of the many generators for code, try `ember help generate` for more details
 
-### Running tests
+### Running Tests
 
 * `ember test`
 * `ember test --server`
 
-### Linting
-
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
-
 ### Building
 
 * `ember build` (development)
@@ -52,66 +43,35 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Deploying
 
-_(You need collaborator permissions on the 5apps Deploy project.)_
+Specify what it takes to deploy your app.
 
-`npm run deploy`
 
-### Working with locally deployed contracts
+## Working with locally deployed contracts
 
-The smart contracts and their JavaScript wrapper library are developed in the
+For development you might want to run your own development chain with your own development contracts.
-[kredits-contracts](https://github.com/67P/kredits-contracts) repo/package.
+The kredits-contracts helper scripts are available in kredits-web. See [kredits-contracts](https://github.com/67P/kredits-contracts) for more information.
 
-You can run `kredits-web` on your machine, against a local, simulated
+Start your parity node with a KreditsChain: 
-blockchain. [kredits-contracts](https://github.com/67P/kredits-contracts)
-contains all the tools to start and set up such a simulated network, as well as
-to deploy the Kredits smart contracts to it.
     
-These are the basic steps to get up and running:
+    npm run kredits-parity
 
-#### 1. IPFS
+Deploy the contracts to your local chain: 
 
-Run a local IPFS deamon.
+    npm run kredits-deploy
 
-  * Make sure CORS headers are configured. See [IPFS](#ipfs) for more info.
+Run kredits-web with your localy deployed contracts: 
-  * `ipfs daemon`
 
-#### 2. kredits-contracts
+    KREDITS_CONTRACT_ADDR=`kredits-inspect -c Kredits -r -w address` \
+    TOKEN_CONTRACT_ADDR=`kredits-inspect -c Token -r -w address` \
+    npm start
 
-Run a local devchain with test data. (See [kredits-contracts
+    You need to have `./node_modules/.bin` in your path for this to work. Otherwise simply copy the contract addresses and set the environment variables manually.
-README](https://github.com/67P/kredits-contracts) for details.
     
-  * Clone [kredits-contracts](https://github.com/67P/kredits-contracts)
-  * `npm install`
-  * `npm run devchain` - runs a local development chain
-  * `npm run bootstrap` - deploys all contracts and seeds test data
-  * `npm link` - makes the `kredits-contracts` module linkable as `kredits-contracts` on your machine
 
-#### 3. kredits-web
-
-With IPFS and the local devchain running, you can now link the contracts and
-start the Ember app:
-
-  * `npm link kredits-contracts` - links the local `kredits-contracts` package (has to be done again after every `npm install`)
-  * `npm run start:local` - runs the Ember app with WEB3_PROVIDER_URL=http://localhost:8545 set
-
-#### 4. Metamask network
-
-If you want to interact with the local contracts via a Web3 wallet, switch the
-network to a "Custom RPC" one, with the RPC URL `http://localhost:8545`.
-
-#### IPFS
-
-If you haven't configured your IPFS node for CORS yet, you can do so by running
-the following commands:
-
-    ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["localhost:4200"]'
-    ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "GET", "POST"]'
-    ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials '["true"]'
-    ipfs config Addresses.Gateway /ip4/127.0.0.1/tcp/8080
 
 ## Further Reading / Useful Links
 
-* [ember.js](https://emberjs.com/)
+* [ember.js](http://emberjs.com/)
 * [ember-cli](https://ember-cli.com/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)

app/app.js

@@ -1,12 +1,18 @@
-import Application from '@ember/application';
+import Ember from 'ember';
-import Resolver from 'ember-resolver';
+import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-export default class App extends Application {
+let App;
-  modulePrefix = config.modulePrefix;
+
-  podModulePrefix = config.podModulePrefix;
+Ember.MODEL_FACTORY_INJECTIONS = true;
-  Resolver = Resolver;
+
-}
+App = Ember.Application.extend({
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
+  Resolver
+});
 
 loadInitializers(App, config.modulePrefix);
+
+export default App;

app/components/add-contribution/component.js

@@ -1,88 +0,0 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-import { and, notEmpty } from '@ember/object/computed';
-import { assign } from '@ember/polyfills';
-import moment from 'moment';
-import { inject as service } from '@ember/service';
-
-export default Component.extend({
-  kredits: service(),
-
-  attributes: null,
-
-  contributors: computed('kredits.contributorsSorted.[]', function() {
-    return this.kredits.contributorsSorted.map(c => {
-      return {
-        id: c.id.toString(),
-        name: c.name
-      }
-    })
-  }),
-
-  isValidContributor: notEmpty('contributorId'),
-  isValidKind: notEmpty('kind'),
-  isValidAmount: computed('amount', function() {
-    return parseInt(this.amount, 10) > 0;
-  }),
-  isValidDescription: notEmpty('description'),
-  isValidUrl: notEmpty('url'),
-  isValid: and('isValidContributor',
-               'isValidKind',
-               'isValidAmount',
-               'isValidDescription'),
-
-  init () {
-    this._super(...arguments);
-    this.set('defaultDate', moment().startOf('hour').toDate());
-    this.set('defaultAttr', {
-      contributorId: null,
-      kind: null,
-      date: this.defaultDate,
-      amount: null,
-      description: null,
-      url: null,
-      details: null
-    });
-
-    this.set('attributes', assign({}, this.defaultAttr, this.attributes));
-
-    this.reset();
-  },
-
-  reset () {
-    this.setProperties(this.attributes);
-  },
-
-  actions: {
-
-    submit (evt) {
-      evt.preventDefault();
-
-      if (!this.isValid) {
-        alert('Invalid data. Please review and try again.');
-        return;
-      }
-
-      const attributes = this.getProperties(Object.keys(this.attributes));
-
-      attributes.contributorId = parseInt(this.contributorId);
-
-      let dateInput = (attributes.date instanceof Array) ?
-        attributes.date[0] : attributes.date;
-
-      const [ date, time ] = dateInput.toISOString().split('T');
-      [ attributes.date, attributes.time ] = [ date, time ];
-
-      this.set('inProgress', true);
-
-      this.save(attributes)
-        .then((/*contribution*/) => {
-          this.reset();
-        }, err => {
-          console.warn(err);
-          window.alert('Something went wrong. Check the browser console for details.');
-        })
-        .finally(() => this.set('inProgress', false));
-    }
-  }
-});

app/components/add-contribution/template.hbs

@@ -1,86 +0,0 @@
-<form onsubmit={{action "submit"}}>
-  <label>
-    <p class="label">Contributor:</p>
-    <p>
-      <select required onchange={{action (mut this.contributorId) value="target.value"}}>
-        <option value="" selected disabled hidden></option>
-        {{#each this.contributors as |contributor|}}
-          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
-        {{/each}}
-      </select>
-    </p>
-  </label>
-  <label>
-    <p class="label">Kind:</p>
-    <p>
-      <select required onchange={{action (mut this.kind) value="target.value"}}>
-        <option value="" selected disabled hidden></option>
-        <option value="bureaucracy" selected={{eq this.kind "bureaucracy"}}>Bureaucracy</option>
-        <option value="community" selected={{eq this.kind "community"}}>Community</option>
-        <option value="design" selected={{eq this.kind "design"}}>Design</option>
-        <option value="dev" selected={{eq this.kind "dev"}}>Development</option>
-        <option value="docs" selected={{eq this.kind "docs"}}>Documentation</option>
-        <option value="ops" selected={{eq this.kind "ops"}}>IT Operations</option>
-        <option value="outreach" selected={{eq this.kind "outreach"}}>Outreach</option>
-        <option value="qa" selected={{eq this.kind "qa"}}>Quality Assurance</option>
-        <option value="special" selected={{eq this.kind "special"}}>Special</option>
-      </select>
-    </p>
-  </label>
-  <label>
-    <p class="label">Date:</p>
-    <p>
-      {{ember-flatpickr
-        date=this.date
-        defaultDate=this.defaultDate
-        maxDate=this.defaultDate
-        enableTime=true
-        time_24hr=true
-        onChange=(action (mut this.date))
-      }}
-    </p>
-  </label>
-  <label>
-    <p class="label">Amount:</p>
-    <p>
-      {{input type="text"
-              placeholder="500"
-              value=this.amount
-              class=(if this.isValidAmount "valid" "")}}
-    </p>
-  </label>
-  <label>
-    <p class="label">Description:</p>
-    <p>
-      {{input type="text"
-              value=this.description
-              class=(if this.isValidDescription "valid" "")}}
-    </p>
-  </label>
-  <label>
-    <p class="label">URL (optional):</p>
-    <p>
-      {{input type="text"
-              value=this.url
-              class=(if this.isValidUrl "valid" "")}}
-    </p>
-  </label>
-
-  {{#if this.details}}
-    <label>
-      <p class="label">Details:</p>
-      <p>
-        <pre>
-          {{this.details}}
-        </pre>
-      </p>
-    </label>
-  {{/if}}
-
-  <p class="actions">
-    {{input type="submit"
-            disabled=this.inProgress
-            value=(if this.inProgress "Processing" "Save")}}
-  </p>
-</form>
-

app/components/add-contributor/component.js

@@ -1,91 +1,79 @@
-import Component from '@ember/component';
+import Ember from 'ember';
-import { computed } from '@ember/object';
+import Contributor from 'kredits-web/models/contributor';
-import { and, notEmpty } from '@ember/object/computed';
+
-import { inject as service } from '@ember/service';
+const {
-import { isPresent } from '@ember/utils';
+  Component,
-import { isAddress } from 'web3-utils';
+  isPresent,
+  inject: {
+    service
+  },
+  computed
+} = Ember;
 
 export default Component.extend({
 
-  router: service(),
   kredits: service(),
 
-  attributes: null,
+  newContributor: null,
+  inProgress: false,
 
-  isValidAccount: computed('account', function() {
+  isValidAddress: function() {
-    return isAddress(this.account);
+    return this.get('kredits.web3')
-  }),
+               .isAddress(this.get('newContributor.address'));
+  }.property('kredits.web3', 'newContributor.address'),
 
-  isValidName: notEmpty('name'),
+  isValidName: function() {
-  isValidURL: notEmpty('url'),
+    return isPresent(this.get('newContributor.name'));
-  isValidGithubUID: notEmpty('github_uid'),
+  }.property('newContributor.name'),
-  isValidGithubUsername: notEmpty('github_username'),
-  isValidGiteaUsername: notEmpty('gitea_username'),
-  isValidWikiUsername: notEmpty('wiki_username'),
-  isValidZoomDisplayName: notEmpty('zoom_display_name'),
 
-  isValid: and(
+  isValidURL: function() {
-    'isValidAccount',
+    return isPresent(this.get('newContributor.url'));
+  }.property('newContributor.url'),
+
+  isValidGithubUID: function() {
+    return isPresent(this.get('newContributor.github_uid'));
+  }.property('newContributor.github_uid'),
+
+  isValidGithubUsername: function() {
+    return isPresent(this.get('newContributor.github_username'));
+  }.property('newContributor.github_username'),
+
+  isValidWikiUsername: function() {
+    return isPresent(this.get('newContributor.wiki_username'));
+  }.property('newContributor.wiki_username'),
+
+  isValid: computed.and(
+    'isValidAddress',
     'isValidName',
     'isValidGithubUID'
   ),
 
-  inProgress: false,
-
-  init () {
-    this._super(...arguments);
-    this.setDefaultAttributes();
-    this.reset();
-  },
-
-  setDefaultAttributes () {
-    if (isPresent(this.attributes)) { return; }
-
-    this.set('attributes', {
-      account: null,
-      name: null,
-      kind: 'person',
-      url: null,
-      github_username: null,
-      github_uid: null,
-      gitea_username: null,
-      wiki_username: null,
-      zoom_display_name: null
-    });
-  },
-
   reset: function() {
-    this.setProperties(this.attributes);
+    this.setProperties({
+      newContributor: Contributor.create({ kind: 'person' }),
+      inProgress: false
+    });
   },
 
   actions: {
 
-    submit (evt) {
+    save() {
-      evt.preventDefault();
+      if (!this.get('contractInteractionEnabled')) {
-
+        alert('Only core team members can add new contributors. Please ask someone to set you up.');
-      if (!this.kredits.currentUserIsCore) {
-        window.alert('Only core team members can edit profiles. Please ask someone to set you up.');
-        return;
-      }
-      if (!this.isValid) {
-        window.alert('Invalid data. Please review and try again.');
         return;
       }
 
-      const attributes = Object.keys(this.attributes);
+      if (this.get('isValid')) {
-      const contributor = this.getProperties(attributes);
+        this.set('inProgress', true);
 
-      this.set('inProgress', true);
+        this.get('kredits').addContributor(this.get('newContributor')).then(contributor => {
-
+          this.reset();
-      this.save(contributor).then(() => {
+          this.get('contributors').pushObject(contributor);
-        this.reset();
+          window.scroll(0,0);
-      }).catch(err => {
+        });
-        console.warn(err);
+      } else {
-        window.alert('Something went wrong. Please check the browser console.');
+        alert('Invalid data. Please review and try again.');
-      }).finally(() => {
+      }
-        this.set('inProgress', false);
-        this.router.transitionTo('dashboard');
-      });
     }
 
   }

app/components/add-contributor/template.hbs

@@ -1,56 +1,59 @@
-<form onsubmit={{action "submit"}}>
+<form {{action "save" on="submit"}}>
   <p>
-    <label for="c-account">Ethereum account</label>
+    {{input type="checkbox" name="is-core" id="is-core" checked=newContributor.isCore}}
-      <Input @type="text"
+    <label for="is-core" class="checkbox">
-             @value={{this.account}}
+      Core team member (can add contributors)
-             name="account" id="c-account"
+    </label>
-             placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-             class={{if this.isValidAccount "valid" ""}} />
   </p>
   <p>
-    <label for="c-kind">Kind</label>
+    {{input name="address"
-    <select required onchange={{action (mut this.kind) value="target.value"}} id="c-kind">
+            type="text"
-      <option value="person" selected={{eq this.kind "person"}}>Person</option>
+            placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-      <option value="organization" selected={{eq this.kind "organization"}}>Organization</option>
+            value=newContributor.address
+            class=(if isValidAddress 'valid' '')}}
+  </p>
+  <p>
+    <select required onchange={{action (mut newContributor.kind) value="target.value"}}>
+      <option value="person" selected={{eq newContributor.kind "person"}}>Person</option>
+      <option value="organization" selected={{eq newContributor.kind "organization"}}>Organization</option>
     </select>
   </p>
   <p>
-    <label for="c-name">Name</label>
+    {{input name="name"
-    {{input name="name" type="text" value=this.name placeholder="Zero Cool"
+            type="text"
-            class=(if this.isValidName "valid" "") id="c-name"}}
+            placeholder="Name"
+            value=newContributor.name
+            class=(if isValidName 'valid' '')}}
   </p>
   <p>
-    <label for="c-url">URL</label>
+    {{input name="url"
-    {{input name="url" type="text" value=this.url placeholder="http://zerocool.bit"
+            type="text"
-            class=(if this.isValidURL "valid" "") id="c-url"}}
+            placeholder="URL"
+            value=newContributor.url
+            class=(if isValidURL 'valid' '')}}
   </p>
   <p>
-    <label for="c-github-uid">GitHub UID</label>
+    {{input name="github_uid"
-    {{input name="github_uid" type="text" value=this.github_uid placeholder="2342"
+            type="text"
-            class=(if this.isValidGithubUID "valid" "") id="c-github-uid"}}
+            placeholder="GitHub UID (123)"
+            value=newContributor.github_uid
+            class=(if isValidGithubUID 'valid' '')}}
   </p>
   <p>
-    <label for="c-github-username">GitHub username</label>
+    {{input name="github_username"
-    {{input name="github_username" type="text" value=this.github_username placeholder="zerocool"
+            type="text"
-            class=(if this.isValidGithubUsername "valid" "") id="c-github-username"}}
+            placeholder="GitHub username"
+            value=newContributor.github_username
+            class=(if isValidGithubUsername 'valid' '')}}
   </p>
   <p>
-    <label for="c-gitea-username">Gitea username</label>
+    {{input name="wiki_username"
-    {{input name="gitea_username" type="text" value=this.gitea_username placeholder="zerocool"
+            type="text"
-            class=(if this.isValidGiteaUsername "valid" "") id="c-gitea-username"}}
+            placeholder="Wiki Username"
-  </p>
+            value=newContributor.wiki_username
-  <p>
+            class=(if isValidWikiUsername 'valid' '')}}
-    <label for="c-wiki-username">Wiki username</label>
-    {{input name="wiki_username" type="text" value=this.wiki_username placeholder="ZeroCool"
-            class=(if this.isValidWikiUsername "valid" "") id="c-wiki-username"}}
-  </p>
-  <p>
-    <label for="c-zoom-display-name">Zoom display name</label>
-    {{input name="zoom_display_name" type="text" value=this.zoom_display_name placeholder="Zero Cool"
-            class=(if this.isValidZoomDisplayName "valid" "") id="c-zoom-display-name"}}
   </p>
   <p class="actions">
-    {{input type="submit" disabled=this.inProgress
+    {{input type="submit" value=(if inProgress 'Processing' 'Save') disabled=inProgress}}
-            value=(if this.inProgress "Processing" "Save")}}
   </p>
 </form>

app/components/add-expense-item/component.js

@@ -1,91 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import moment from 'moment';
-import isValidAmount from 'kredits-web/utils/is-valid-amount';
-import { isPresent } from '@ember/utils';
-
-export default class AddExpenseItemComponent extends Component {
-  @tracked amount = '0';
-  @tracked currency = 'EUR';
-  @tracked date = moment().startOf('hour').toDate();
-  @tracked title = '';
-  @tracked description = '';
-  @tracked url = '';
-  @tracked tags = '';
-
-  defaultDate = moment().startOf('hour').toDate();
-
-  currencies = [
-    { code: 'EUR' },
-    { code: 'USD' }
-  ];
-
-  get isValidAmount () {
-    return isValidAmount(this.amount);
-  }
-
-  get amountInputClass () {
-    return this.isValidTotal ? 'valid' : '';
-  }
-
-  validateForm () {
-    const formEl = document.querySelector('form#add-expense-item');
-    const inputFields = formEl.querySelectorAll('input');
-    inputFields.forEach(i => i.classList.remove('invalid'));
-    let validity = true;
-
-    if (!this.isValidAmount) {
-      document.querySelector('input[name=expense-amount]').classList.add('invalid');
-      validity = false;
-    }
-
-    if (!formEl.checkValidity()) {
-      inputFields.forEach(i => {
-        if (!i.validity.valid) {
-          i.classList.add('invalid');
-          validity = false;
-        }
-      })
-    }
-
-    return validity;
-  }
-
-  @action
-  updateCurrency(event) {
-    this.currency = event.target.value;
-  }
-
-  @action
-  submit (e) {
-    e.preventDefault();
-
-    let dateInput = (this.date instanceof Array) ?
-      this.date[0] : this.date;
-
-    const [ date ] = moment(dateInput).utcOffset(0, true)
-                                      .toISOString()
-                                      .split('T');
-
-    const isValid = this.validateForm();
-    if (!isValid) return false;
-
-    const expense = {
-      amount: parseFloat(this.amount),
-      currency: this.currency,
-      date: date,
-      title: this.title,
-      description: isPresent(this.description) ? this.description : undefined,
-      url: isPresent(this.url) ? this.url : undefined,
-    }
-
-    if (isPresent(this.tags)) {
-      expense.tags = this.tags.split(',')
-                              .map(t => t.trim())
-                              .filter(t => t.length > 0);
-    }
-
-    this.args.addExpenseItem(expense);
-  }
-}

app/components/add-expense-item/template.hbs

@@ -1,69 +0,0 @@
-<form id="add-expense-item" {{on "submit" this.submit}} novalidate>
-  <fieldset class="horizontal">
-    <label>
-      <p class="label">Amount:</p>
-      <p>
-        <Input @name="expense-amount"
-               @type="text"
-               @placeholder="10"
-               @value={{this.amount}}
-               @required={{true}}
-               @pattern="([0-9]*[.])?[0-9]+"
-               @class={{this.amountInputClass}} />
-      </p>
-    </label>
-    <label>
-      <p class="label">Currency:</p>
-      <p>
-        <select required name="expense-currency" {{on "change" this.updateCurrency}}>
-          <option value="" selected disabled hidden></option>
-          {{#each this.currencies as |currency|}}
-          <option value={{currency.code}} selected={{eq this.currency currency.code}}>{{currency.code}}</option>
-          {{/each}}
-        </select>
-      </p>
-    </label>
-  </fieldset>
-  <label>
-    <p class="label">Date:</p>
-    <p>
-      <EmberFlatpickr @date={{this.date}}
-                      @defaultDate={{this.defaultDate}}
-                      @maxDate={{this.defaultDate}}
-                      @enableTime={{false}}
-                      @onChange={{fn (mut this.date)}} />
-    </p>
-  </label>
-  <label>
-    <p class="label">Title:</p>
-    <p>
-      <Input @name="expense-title"
-             @type="text"
-             @value={{this.title}}
-             @required={{true}} />
-    </p>
-  </label>
-  <label>
-    <p class="label">Description (optional):</p>
-    <p>
-      <Input @name="expense-description" @type="text" @value={{this.description}} />
-    </p>
-  </label>
-  <label>
-    <p class="label">URL (optional):</p>
-    <p>
-      <Input @name="expense-url" @type="url" @value={{this.url}} />
-    </p>
-  </label>
-  <label>
-    <p class="label">Tags (comma-separated, optional):</p>
-    <p>
-      <Input @name="expense-tags" @type="text" @value={{this.tags}} />
-    </p>
-  </label>
-
-  <p class="actions">
-    <Input @type="submit" @value="Add" @class="green"
-           @title="Add item to reimbursement" />
-  </p>
-</form>

app/components/add-proposal/component.js

@@ -0,0 +1,66 @@
+import Ember from 'ember';
+
+const {
+  Component,
+  isPresent,
+  inject: {
+    service
+  },
+  computed
+} = Ember;
+
+export default Component.extend({
+
+  kredits: service(),
+
+  proposal: null,
+  contributors: null,
+  inProgress: false,
+
+  isValidRecipient: computed('proposal.recipientAddress', function() {
+    return this.get('kredits.web3').isAddress(this.get('proposal.recipientAddress'));
+  }),
+
+  isValidAmount: computed('proposal.amount', function() {
+    return parseInt(this.get('proposal.amount'), 10) > 0;
+  }),
+
+  isValidUrl: computed('proposal.url', function() {
+    return isPresent(this.get('proposal.url'));
+  }),
+
+  isValidDescription: computed('proposal.description', function() {
+    return isPresent(this.get('proposal.description'));
+  }),
+
+  isValid: computed.and('isValidRecipient',
+                        'isValidAmount',
+                        'isValidDescription'),
+
+  actions: {
+    save() {
+      if (! this.get('isValid')) {
+        alert('Invalid data. Please review and try again.');
+        return false;
+      }
+      this.set('inProgress', true);
+      let proposal = this.get('proposal');
+
+      // Set the recipient's IPFS profile hash so it can be used in the
+      // contribution object (which is to be stored in IPFS as well)
+      let contributor = this.get('contributors').findBy('address', proposal.get('recipientAddress'));
+      proposal.set('recipientProfile', contributor.get('ipfsHash'));
+
+      this.get('kredits').addProposal(proposal)
+        .then(() => {
+          this.attrs.onSave();
+        }).catch((error) => {
+          Ember.Logger.error('[add-proposal] error creating the proposal', error);
+          alert('Something went wrong.');
+        }).finally(() => {
+          this.set('inProgress', false);
+        });
+    }
+  }
+
+});

app/components/add-proposal/template.hbs

@@ -0,0 +1,42 @@
+<form {{action "save" on="submit"}}>
+  <p>
+    <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>
+    <select required onchange={{action (mut proposal.kind) value="target.value"}}>
+      <option value="community" selected={{eq proposal.kind "community"}}>Community</option>
+      <option value="design" selected={{eq proposal.kind "design"}}>Design</option>
+      <option value="dev" selected={{eq proposal.kind "dev"}}>Development</option>
+      <option value="docs" selected={{eq proposal.kind "docs"}}>Documentation</option>
+      <option value="ops" selected={{eq proposal.kind "ops"}}>IT Operations</option>
+    </select>
+  </p>
+  <p>
+    {{input type="text"
+            placeholder="100"
+            value=proposal.amount
+            class=(if isValidAmount 'valid' '')}}
+  </p>
+  <p>
+    {{input type="text"
+            placeholder="Description"
+            value=proposal.description
+            class=(if isValidDescription 'valid' '')}}
+  </p>
+  <p>
+    {{input type="text"
+            placeholder="URL (optional)"
+            value=proposal.url
+            class=(if isValidUrl 'valid' '')}}
+  </p>
+  <p class="actions">
+    {{input type="submit" value=(if inProgress 'Processing' 'Save') disabled=inProgress}}
+    {{#link-to 'index'}}Back{{/link-to}}
+  </p>
+</form>
+

app/components/add-reimbursement/component.js

@@ -1,165 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { alias } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { A } from '@ember/array';
-import { scheduleOnce } from '@ember/runloop';
-import isValidAmount from 'kredits-web/utils/is-valid-amount';
-import readFileContent from 'kredits-web/utils/read-file-content';
-import config from 'kredits-web/config/environment';
-
-export default class AddReimbursementComponent extends Component {
-  @service router;
-  @service kredits;
-  @service exchangeRates;
-
-  @alias('kredits.contributorsSorted') contributors;
-
-  @tracked recipientId = null;
-  @tracked title = '';
-  @tracked total = '0';
-  @tracked expenses = A([]);
-  @tracked expenseFormVisible = true;
-
-  constructor() {
-    super(...arguments);
-    this.exchangeRates.fetchRates();
-  }
-
-  get isValidTotal () {
-    return isValidAmount(this.total);
-  }
-
-  get totalInputClass () {
-    return this.isValidTotal ? 'valid' : '';
-  }
-
-  get totalEUR () {
-    const expenses = this.expenses.filterBy('currency', 'EUR');
-    if (expenses.length > 0) {
-      return expenses.mapBy('amount')
-                     .reduce((summation, current) => summation + current);
-    } else {
-      return 0;
-    }
-  }
-
-  get totalUSD () {
-    const expenses = this.expenses.filterBy('currency', 'USD');
-    if (expenses.length > 0) {
-      return expenses.mapBy('amount')
-                     .reduce((summation, current) => summation + current);
-    } else {
-      return 0;
-    }
-  }
-
-  get submitButtonEnabled () {
-    return this.isValidTotal &&
-           (this.expenses.length > 0);
-  }
-
-  get submitButtonDisabled () {
-    return !this.submitButtonEnabled;
-  }
-
-  scrollToExpenseItemForm () {
-    const anchor = document.getElementById('new-expense-item');
-    anchor.scrollIntoView();
-  }
-
-  updateTotalAmountFromFiat() {
-    let btcAmount = parseFloat(this.total);
-
-    if (this.exchangeRates.btceur > 0 && this.totalEUR > 0) {
-      btcAmount += (this.totalEUR / this.exchangeRates.btceur);
-    }
-    if (this.exchangeRates.btcusd > 0 && this.totalUSD > 0) {
-      btcAmount += (this.totalUSD / this.exchangeRates.btcusd);
-    }
-    if (this.totalUSD === 0 && this.totalEUR === 0) {
-      btcAmount = 0;
-    }
-
-    this.total = btcAmount.toFixed(8);
-  }
-
-  // TODO use ember-concurrency here
-  // https://github.com/67P/kredits-web/pull/209#discussion_r1064234421
-  @action
-  async addExpensesFromFile (evt) {
-    const content = await readFileContent(evt.target.files[0]);
-    const expenses = JSON.parse(content);
-
-    if (expenses instanceof Array) {
-      for (const item of expenses) {
-        this.addExpenseItem(item);
-      }
-    } else {
-      console.warn("Expenses in file must be a list of items:");
-      console.debug(content);
-    }
-  }
-
-  @action
-  updateContributor (event) {
-    this.recipientId = event.target.value;
-  }
-
-  @action
-  showExpenseForm () {
-    this.expenseFormVisible = true;
-    scheduleOnce('afterRender', this, this.scrollToExpenseItemForm);
-  }
-
-  @action
-  addExpenseItem (expenseItem) {
-    this.expenses.pushObject(expenseItem);
-    this.updateTotalAmountFromFiat();
-    this.expenseFormVisible = false;
-  }
-
-  @action
-  removeExpenseItem (expenseItem) {
-    this.expenses.removeObject(expenseItem);
-    this.updateTotalAmountFromFiat();
-
-    if (this.expenses.length === 0) {
-      this.expenseFormVisible = true;
-    }
-  }
-
-  @action
-  submit (e) {
-    e.preventDefault();
-    if (!this.kredits.currentUser) { window.alert('You need to connect your RSK account first.'); return false }
-    if (!this.kredits.currentUserIsCore) { window.alert('Only core contributors can submit reimbursements.'); return false }
-
-    const contributor = this.contributors.findBy('id', parseInt(this.recipientId));
-
-    const attributes = {
-      amount: parseInt(parseFloat(this.total) * 100000000), // convert to sats
-      token: config.tokens['BTC'],
-      recipientId: parseInt(this.recipientId),
-      title: `Expenses covered by ${contributor.name}`,
-      description: this.description,
-      url: this.url,
-      expenses: JSON.parse(JSON.stringify((this.expenses)))
-    }
-
-    this.inProgress = true;
-
-    this.kredits.addReimbursement(attributes)
-      .then((/* reimbursement */) => {
-        this.router.transitionTo('budget');
-      })
-      .catch(e => {
-        console.error('Could not add reimbursement:', e);
-        window.alert('Something went wrong. Please check the browser console.')
-      })
-      .finally(() => {
-        this.inProgress = false;
-      });
-  }
-}

app/components/add-reimbursement/template.hbs

@@ -1,79 +0,0 @@
-<form {{on "submit" this.submit}} novalidate>
-  <label>
-    <p class="label">Contributor:</p>
-    <p>
-      <select required {{on "change" this.updateContributor}}>
-        <option value="" selected disabled hidden></option>
-        {{#each this.contributors as |contributor|}}
-          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
-        {{/each}}
-      </select>
-    </p>
-  </label>
-  <fieldset class="horizontal thirds total-amounts">
-    <label>
-      <p class="label">Total amount (BTC):</p>
-      <p>
-        <Input @type="text"
-               @placeholder="0.0015"
-               @value={{this.total}}
-               @required={{true}}
-               @pattern="([0-9]*[.])?[0-9]+"
-               @class={{this.totalInputClass}} />
-      </p>
-    </label>
-    <label>
-      <p class="label">EUR total</p>
-      <p>
-        <Input @type="text"
-               @name="total-eur"
-               @value={{this.totalEUR}}
-               @disabled={{true}} />
-      </p>
-    </label>
-    <label>
-      <p class="label">USD total</p>
-      <p>
-        <Input @type="text"
-               @name="total-usd"
-               @value={{this.totalUSD}}
-               @disabled={{true}} />
-      </p>
-    </label>
-  </fieldset>
-
-  <h3>Expense items</h3>
-  {{#if this.expenses}}
-     <ExpenseList @expenses={{this.expenses}}
-                  @removeExpenseItem={{this.removeExpenseItem}}
-                  @deletable={{true}} />
-
-    <p class="actions">
-      <button {{on "click" this.showExpenseForm}}
-        class="green small" type="button">+ Add another item</button>
-    </p>
-  {{else}}
-    <p>No line items yet.</p>
-  {{/if}}
-
-  <p class="actions">
-    {{#if this.inProgress}}
-      <Input @type="submit" @value="Submitting..." @disabled={{true}}
-             @title="Submit/propose this reimbursement" />
-    {{else}}
-      <Input @type="submit" @value="Submit" @disabled={{this.submitButtonDisabled}}
-             @title="Submit/propose this reimbursement" />
-    {{/if}}
-  </p>
-
-  {{#if this.expenseFormVisible}}
-    <h3 id="new-expense-item">New expense item</h3>
-    <AddExpenseItem @addExpenseItem={{fn this.addExpenseItem}} />
-  {{/if}}
-</form>
-<form id="add-expenses-from-file">
-  <h3>Add expense items from file</h3>
-  <input type="file" multiple="false"
-         onchange={{fn this.addExpensesFromFile}}
-         accept="application/json" />
-</form>

app/components/budget-balances/component.js

@@ -1,12 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { alias } from '@ember/object/computed';
-
-export default class BudgetBalancesComponent extends Component {
-  @service communityFunds;
-  @alias('communityFunds.balances') balances;
-
-  get loading () {
-    return !this.communityFunds.balancesLoaded;
-  }
-}

app/components/budget-balances/template.hbs

@@ -1,18 +0,0 @@
-<table class="token-balances {{if this.loading 'loading'}}">
-  <thead>
-    <tr>
-      <th>Token</th>
-      <th>Amount</th>
-      <th>Fiat value</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each this.balances as |balance|}}
-      <tr>
-        <th>{{balance.token.symbol}}</th>
-        <td class="amount">{{balance.confirmed_balance}}</td>
-        <td class="fiat-amount">~{{balance.balanceUSD}} USD</td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>

app/components/chart-contributions-by-type/component.js

@@ -1,64 +0,0 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-
-let categoryColors = {
-  community: "#fb6868",
-  design: "#fbe468",
-  dev: "#e068fb",
-  docs: "#97fb68",
-  ops: "#8f68fb",
-}
-
-export default Component.extend({
-
-  contributions: null,
-  chartOptions: Object.freeze({
-    legend: {
-      display: false
-    }
-  }),
-
-  chartData: computed('contributions', function() {
-    let kredits = this.contributions
-                      .filterBy('vetoed', false)
-                      .map(c => {
-                        return { kind: c.kind, amount: c.amount }
-                      })
-                      .reduce(function (kinds, c) {
-                        if (c.kind in kinds) {
-                          kinds[c.kind] = kinds[c.kind] + c.amount
-                        } else {
-                          kinds[c.kind] = c.amount;
-                        }
-                        return kinds;
-                      }, {});
-
-    return {
-      datasets: [{
-        data: [
-          kredits['community'],
-          kredits['design'],
-          kredits['dev'],
-          kredits['ops'],
-          kredits['docs'],
-        ],
-        borderColor: [
-          categoryColors.community,
-          categoryColors.design,
-          categoryColors.dev,
-          categoryColors.ops,
-          categoryColors.docs,
-        ],
-        borderWidth: 1
-      }],
-      labels: [
-        'Community',
-        'Design',
-        'Development',
-        'Operations & Infrastructure',
-        'Documentation'
-      ],
-    }
-  })
-
-});

app/components/chart-contributions-by-type/template.hbs

@@ -1,6 +0,0 @@
-<div class="chart">
-  <EmberChart @type="doughnut"
-              @data={{this.chartData}}
-              @options={{this.chartOptions}}
-              @width="200" @height="200" />
-</div>

app/components/confirmed-in/component.js

@@ -1,24 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import moment from 'moment';
-
-export default class ConfirmedInComponent extends Component {
-  @service kredits;
-
-  get confirmedInBlocks () {
-    return this.args.confirmedAtBlock - this.kredits.currentBlock;
-  }
-
-  get confirmedInSeconds () {
-    // A new block is mined every 30 seconds on average
-    return this.confirmedInBlocks * 30;
-  }
-
-  get confirmedInHumanTime () {
-    return moment.duration(this.confirmedInSeconds, "seconds").humanize();
-  }
-
-  get isConfirmed () {
-    return this.confirmedInBlocks <= 0;
-  }
-}

app/components/confirmed-in/template.hbs

@@ -1,3 +0,0 @@
-{{#unless this.isConfirmed}}
-Confirming in <strong>{{this.confirmedInBlocks}}</strong> blocks (~ {{this.confirmedInHumanTime}})
-{{/unless}}

app/components/contribution-list/component.js

@@ -1,69 +1,16 @@
-import Component from '@ember/component';
+import Ember from 'ember';
-import { computed } from '@ember/object';
-import { sort } from '@ember/object/computed';
-import { isPresent } from '@ember/utils';
-import { inject as service } from '@ember/service';
 
-export default Component.extend({
+export default Ember.Component.extend({
 
-  router: service(),
+  tagName: 'ul',
+  classNames: ['contribution-list'],
 
-  tagName: 'div',
+  contributionsWithContributors: function() {
-  classNames: ['contributions'],
+    return this.get('contributions').map((c) => {
-
+      c.set('contributor', this.get('contributors')
-  selectedContribution: null,
+                               .findBy('address', c.get('recipientAddress')));
-
+      return c;
-  showQuickFilter: false,
-  hideSmallContributions: false,
-  contributorId: null,
-  contributionKind: null,
-
-  kredits: service(),
-
-  contributorsSorting: Object.freeze(['name:asc']),
-  contributors: sort('kredits.contributors', 'contributorsSorting'),
-
-  contributorsActive: computed('contributors.[]', 'contributions', function() {
-    const activeIds = new Set(this.contributions.mapBy('contributorId'));
-
-    return this.contributors.filter(c => activeIds.has(c.id));
-  }),
-
-  contributionKinds: computed('contributions.[]', function() {
-    return this.contributions.mapBy('kind').uniq();
-  }),
-
-  contributionsFiltered: computed('contributions.[]', 'hideSmallContributions', 'contributorId', 'contributionKind', function() {
-    return this.contributions.filter(c => {
-      let included = true;
-
-      if (this.hideSmallContributions &&
-          c.amount <= 500) { included = false; }
-
-      if (isPresent(this.contributorId) &&
-          c.contributorId !== parseInt(this.contributorId)) { included = false; }
-
-      if (isPresent(this.contributionKind) &&
-          c.kind !== this.contributionKind) { included = false; }
-
-      return included;
     });
-  }),
+  }.property('contributions.@each')
-
-  actions: {
-
-    veto (contributionId) {
-      if (this.contractInteractionEnabled) {
-        this.vetoContribution(contributionId);
-      } else {
-        window.alert('Only members can veto contributions. Please ask someone to set you up.');
-      }
-    },
-
-    openContributionDetails(contribution) {
-      this.router.transitionTo('dashboard.contributions.show', contribution);
-    }
-
-  }
 
 });

app/components/contribution-list/template.hbs

@@ -1,56 +1,7 @@
-{{#if @showQuickFilter}}
+{{#each contributionsWithContributors as |contribution|}}
-  <div class="quick-filter">
+  <li title="({{contribution.kind}}) {{contribution.description}}">
-    <p>
+    <span class="category {{contribution.kind}}">♥</span>
-      <label class="filter-contributor">
+    <span class="amount">{{contribution.amount}}</span><span class="symbol">₭S</span>
-        Contributor:
+    for <span class="recipient">{{contribution.contributor.name}}</span>
-        <select onchange={{action (mut this.contributorId) value="target.value"}}>
+  </li>
-          <option value="" selected>all</option>
+{{/each}}
-          {{#each this.contributorsActive as |contributor|}}
-            <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
-          {{/each}}
-        </select>
-      </label>
-
-      <label class="filter-contribution-kind">
-        Kind:
-        <select onchange={{action (mut this.contributionKind) value="target.value"}}>
-          <option value="" selected>all</option>
-          {{#each this.contributionKinds as |kind|}}
-            <option value={{kind}} selected={{eq this.contributionKind kind}}>{{capitalize-string kind}}</option>
-          {{/each}}
-        </select>
-      </label>
-
-      <label class="filter-contribution-size">
-        <Input @type="checkbox" @checked={{this.hideSmallContributions}} />
-        Hide small contributions
-      </label>
-    </p>
-  </div>
-{{/if}}
-
-<ul class="item-list contribution-list {{if @loading 'loading'}}">
-  {{#each this.contributionsFiltered as |contribution|}}
-    <li role="button" data-contribution-id={{contribution.id}}
-        {{action "openContributionDetails" contribution}}
-        class="{{item-status contribution}}{{if (eq contribution.id @selectedContributionId) " selected"}}">
-      <p class="meta">
-        <span class="recipient"><UserAvatar @contributor={{contribution.contributor}} /></span>
-        <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
-        <span class="title">{{contribution.description}}</span>
-      </p>
-      <p class="kredits-amount">
-        <span class="amount">{{contribution.amount}}</span><span class="symbol">₭S</span>
-      </p>
-      {{#unless contribution.vetoed}}
-        {{#unless (is-confirmed-contribution contribution)}}
-          <p class="voting">
-            {{input type="button" class="button small danger" value="veto"
-                    click=(action "veto" contribution.id)
-                    disabled=contribution.hasPendingChanges}}
-          </p>
-        {{/unless}}
-      {{/unless}}
-    </li>
-  {{/each}}
-</ul>

app/components/contributor-list/component.js

@@ -1,18 +1,22 @@
-import Component from '@ember/component';
+import Ember from 'ember';
-import { inject as service } from '@ember/service';
 
-export default Component.extend({
+export default Ember.Component.extend({
-  tagName: '',
 
-  router: service(),
+  tagName: 'table',
-
+  classNames: 'contributor-list',
-  selectedContributorId: null,
+  selectedContributor: null,
 
   actions: {
 
-    openContributorDetails(contributor) {
+    toggleContributorInfo(contributor) {
-      this.router.transitionTo('dashboard.contributors.show', contributor);
+      if (contributor.get('showMetadata')) {
+        contributor.set('showMetadata', false);
+      } else {
+        this.get('contributors').setEach('showMetadata', false);
+        contributor.set('showMetadata', true);
+      }
     }
 
   }
+
 });

app/components/contributor-list/template.hbs

@@ -1,25 +1,24 @@
-<table class="contributor-list {{if @loading 'loading'}}">
+<tbody>
-  <thead>
+  {{#each contributors as |contributor|}}
-  </thead>
+    <tr class="{{if contributor.isCurrentUser 'current-user'}}" {{action "toggleContributorInfo" contributor}}>
-  <tbody>
+      <td class="person">
-    {{#each @contributorList as |c|}}
+        <img class="avatar" src={{contributor.avatarURL}}>
-      <tr role="button"
+        {{contributor.name}}
-          onclick={{action "openContributorDetails" c.contributor}}
+      </td>
-          class="{{if (is-current-user c.contributor) "current-user"}} {{if (eq c.contributor.id @selectedContributorId) "selected"}}">
+      <td class="kredits">
-        <td class="person">
+        <span class="amount">{{contributor.kredits}}</span>
-          <UserAvatar @contributor={{c.contributor}} /> {{c.contributor.name}}
+        <span class="symbol">₭S</span>
-        </td>
+      </td>
-        <td class="kredits">
+    </tr>
-          <span class="amount">
+    <tr class="metadata {{if contributor.isCurrentUser 'current-user'}} {{if contributor.showMetadata 'visible'}}">
-            {{#if @showUnconfirmedKredits}}
+      <td colspan="2">
-              {{c.amountTotal}}
+        <ul>
-            {{else}}
+          <li><a href="https://testnet.etherscan.io/address/{{contributor.address}}">Inspect Ethereum transactions</a></li>
-              {{c.amountConfirmed}}
+          {{#if contributor.ipfsHash}}
-            {{/if}}
+            <li><a href="https://ipfs.io/ipfs/{{contributor.ipfsHash}}">Inspect IPFS profile</a></li>
-          </span>
+          {{/if}}
-          <span class="symbol">₭S</span>
+        </ul>
-        </td>
+      </td>
-      </tr>
+    </tr>
-    {{/each}}
+  {{/each}}
-  </tbody>
+</tbody>
-</table>

app/components/expense-list/component.js

@@ -1,9 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class ExpenseListComponent extends Component {
-
-  get showDeleteButton () {
-    return !!this.args.deletable;
-  }
-
-}

app/components/expense-list/template.hbs

@@ -1,29 +0,0 @@
-<ul class="expense-list">
-  {{#each @expenses as |expense|}}
-    <li class="expense-item">
-      <h4>
-        <span class="date">{{fmt-date-localized expense.date}}:</span>
-        <span class="title">{{expense.title}}</span>
-      </h4>
-      <div class="amount">
-        {{fmt-fiat-currency expense.amount expense.currency}}
-      </div>
-      <p class="description">
-        {{expense.description}}
-      </p>
-      <p class="tags">
-        {{#each expense.tags as |tag|}}
-          <button type="button" class="small yellow" role="none">
-            <IconTag />{{tag}}
-          </button>
-        {{/each}}
-      </p>
-      {{#if this.showDeleteButton}}
-        <div class="actions">
-          <button {{on "click" (fn @removeExpenseItem expense)}}
-            class="danger small" type="button">delete</button>
-        </div>
-      {{/if}}
-    </li>
-  {{/each}}
-</ul>

app/components/external-account-link/component.js

@@ -1,15 +0,0 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-
-export default Component.extend({
-  tagName: "",
-  account: null,
-
-  iconComponentName: computed('account.site', function() {
-    if (this.account.site.match(/github|gitea|wiki|zoom/)) {
-      return 'icon-account-' + this.account.site.replace(/\./g, '-');
-    } else {
-      return 'icon-web-globe';
-    }
-  })
-});

app/components/external-account-link/template.hbs

@@ -1,5 +0,0 @@
-<a href={{this.account.url}} target="_blank" rel="noopener noreferrer"
-   title="{{this.account.username}} on {{this.account.site}}">
-  <span class="site">{{this.account.site}}</span>
-  {{component this.iconComponentName}}
-</a>

app/components/loading-spinner/component.js

@@ -1,6 +1,6 @@
-import Component from '@ember/component';
+import Ember from 'ember';
 
-export default Component.extend({
+export default Ember.Component.extend({
 
   classNames: ['loading-spinner']
 

app/components/loading-spinner/template.hbs

@@ -10,5 +10,5 @@
   </svg>
 </p>
 <p>
-  Loading data...
+  Loading data from Ethereum...
 </p>

app/components/proposal-list/component.js

@@ -0,0 +1,20 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+
+  tagName: 'ul',
+  classNames: ['proposal-list'],
+
+  actions: {
+
+    confirm(proposalId) {
+      if (this.get('contractInteractionEnabled')) {
+        this.sendAction('confirmAction', proposalId);
+      } else {
+        window.alert('Only members can vote on proposals. Please ask someone to set you up.');
+      }
+    }
+
+  }
+
+});

app/components/proposal-list/template.hbs

@@ -0,0 +1,10 @@
+{{#each proposals as |proposal|}}
+  <li data-proposal-id={{proposal.id}} title="({{proposal.kind}}) {{proposal.description}}">
+    <span class="category {{proposal.kind}}">♥</span>
+    <span class="amount">{{proposal.amount}}</span><span class="symbol">₭S</span>
+    for <span class="recipient">{{proposal.recipientName}}</span>
+    <span class="votes">({{proposal.votesCount}}/{{proposal.votesNeeded}} votes)</span>
+
+    {{#unless proposal.executed}}<button {{action "confirm" proposal.id}}>+1</button>{{/unless}}
+  </li>
+{{/each}}

app/components/reimbursement-list/component.js

@@ -1,23 +0,0 @@
-import Component from '@glimmer/component';
-import { sort } from '@ember/object/computed';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import config from 'kredits-web/config/environment';
-
-export default class ReimbursementListComponent extends Component {
-  @service kredits;
-
-  itemSorting = Object.freeze(['pendingStatus:asc', 'id:desc']);
-  @sort('args.items', 'itemSorting') itemsSorted;
-
-  get ipfsGatewayUrl () {
-    return config.ipfs.gatewayUrl;
-  }
-
-  @action
-  veto (id) {
-    this.kredits.vetoReimbursement(id).then(transaction => {
-      console.debug('[controllers:budget] Veto submitted to chain: '+transaction.hash);
-    });
-  }
-}

app/components/reimbursement-list/template.hbs

@@ -1,38 +0,0 @@
-<ul class="item-list spaced reimbursement-list {{if @loading 'loading'}}">
-  {{#each this.itemsSorted as |reimbursement|}}
-    <li data-reimbursement-id={{reimbursement.id}}
-        class="{{item-status reimbursement}}">
-      <p class="meta">
-        <span class="recipient">
-          <UserAvatar @contributor={{reimbursement.contributor}} />
-        </span>
-        <span class="title">
-          Expenses covered by {{reimbursement.contributor.name}}
-        </span>
-      </p>
-      <p class="token-amount">
-        <span class="amount">
-          {{sats-to-btc reimbursement.amount}}</span>&#8239;<span class="symbol">BTC</span>
-      </p>
-
-      <ExpenseList @expenses={{reimbursement.expenses}} />
-
-      <div class="meta">
-        <p class="confirmation-eta">
-          <ConfirmedIn @confirmedAtBlock={{reimbursement.confirmedAt}} />
-        </p>
-        <p class="actions">
-          <a href="{{this.ipfsGatewayUrl}}/{{reimbursement.ipfsHash}}"
-             class="button small" target="_blank" rel="noopener noreferrer">
-            Inspect IPFS data
-          </a>
-          {{#if this.kredits.currentUserIsCore}}
-            <button {{on "click" (fn this.veto reimbursement.id)}}
-                    disabled={{reimbursement.vetoed}}
-                    class="button small danger" type="button">veto</button>
-          {{/if}}
-        </p>
-      </div>
-    </li>
-  {{/each}}
-</ul>

app/components/topbar-account-panel/component.js

@@ -1,45 +0,0 @@
-import Component from '@ember/component';
-import { inject as service } from '@ember/service';
-import { computed } from '@ember/object';
-import { isPresent } from '@ember/utils';
-
-export default Component.extend({
-
-  tagName: '',
-
-  kredits: service(),
-  router: service(),
-
-  setupInProgress: false,
-
-  userHasEthereumWallet: computed(function() {
-    return isPresent(window.ethereum);
-  }),
-
-  showConnectButton: computed('userHasEthereumWallet',
-                              'kredits.hasAccounts', function() {
-    return this.userHasEthereumWallet &&
-           !this.kredits.hasAccounts;
-  }),
-
-  actions: {
-
-    signup() {
-      this.router.transitionTo('signup');
-    },
-
-    async connectAccount() {
-      try {
-        await window.ethereum.enable();
-        this.set('setupInProgress', true);
-        await this.kredits.setup();
-        this.set('setupInProgress', false);
-      } catch (error) {
-        this.set('setupInProgress', false);
-        console.log('Opening Ethereum wallet failed:', error);
-      }
-    }
-
-  }
-
-});

app/components/topbar-account-panel/template.hbs

@@ -1,18 +0,0 @@
-<section id="user-account">
-  {{#if this.setupInProgress}}
-    Connecting account...
-  {{else}}
-    {{#if (and this.kredits.hasAccounts this.kredits.currentUser)}}
-      {{this.kredits.currentUser.name}}
-      {{#if this.kredits.currentUserIsCore}}
-        <span class="core-flag">(core)</span>
-      {{/if}}
-    {{else}}
-      <span class="anonymous">Anonymous</span>
-      <button onclick={{action "signup"}} class="small" type="button">Sign up</button>
-      {{#if this.showConnectButton}}
-        <button onclick={{action "connectAccount"}} class="small green" type="button">Connect account</button>
-      {{/if}}
-    {{/if}}
-  {{/if}}
-</section>

app/components/user-avatar/component.js

@@ -1,33 +0,0 @@
-import Component from '@ember/component';
-import { alias } from '@ember/object/computed';
-import { computed } from '@ember/object';
-
-const SIZES = {
-  'small':  '128', // pixels
-  'medium': '256',
-  'large':  '512'
-}
-
-export default Component.extend({
-  contributor: null,
-  tagName: 'img',
-  classNames: ['avatar'],
-  classNameBindings: ['size'],
-  attributeBindings: ['src', 'title'],
-  size: 'small',
-
-  src: alias('avatarURL'),
-  title: alias('contributor.name'),
-
-  avatarURL: computed('contributor.github_uid', 'size', function() {
-    const github_uid = this.contributor.github_uid;
-
-    if (github_uid) {
-      return `https://avatars2.githubusercontent.com/u/${github_uid}?v=3&s=${SIZES[this.size]}`;
-    } else {
-      // TODO use custom avatar
-      return '';
-    }
-  })
-
-});

app/controllers/application.js

@@ -1,6 +1,4 @@
-import Controller from '@ember/controller';
+import Ember from 'ember';
-import { inject as service } from '@ember/service';
 
-export default Controller.extend({
+export default Ember.Controller.extend({
-  kredits: service(),
 });

app/controllers/budget.js

@@ -1,10 +0,0 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { alias } from '@ember/object/computed';
-
-export default class BudgetController extends Controller {
-  @service kredits;
-
-  @alias('kredits.reimbursementsUnconfirmed') reimbursementsUnconfirmed;
-  @alias('kredits.reimbursementsConfirmed') reimbursementsConfirmed;
-}

app/controllers/contributions/new.js

@@ -1,32 +0,0 @@
-import Controller from '@ember/controller';
-import { alias, filterBy, sort } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-
-export default Controller.extend({
-
-  kredits: service(),
-
-  queryParams: ['contributorId', 'kind', 'amount'],
-
-  contributors: alias('kredits.contributors'),
-  minedContributors: filterBy('contributors', 'id'),
-
-  contributorsSorting: Object.freeze(['name:asc']),
-  sortedContributors: sort('minedContributors', 'contributorsSorting'),
-
-  actions: {
-
-    save (contribution) {
-      const contributor = this.contributors.findBy('id', contribution.contributorId);
-      contribution.contributorIpfsHash = contributor.ipfsHash;
-
-      return this.kredits.addContribution(contribution)
-        .then(contribution => {
-          this.transitionToRoute('index');
-          return contribution;
-        });
-    }
-
-  }
-
-});

app/controllers/contributions/resubmit.js

@@ -1,7 +0,0 @@
-import ContributionsNewController from 'kredits-web/controllers/contributions/new';
-
-export default ContributionsNewController.extend({
-
-  attributes: null,
-
-});

app/controllers/contributors/edit.js

@@ -1,16 +0,0 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-
-export default Controller.extend({
-
-  kredits: service(),
-
-  actions: {
-
-    save (attributes) {
-      return this.kredits.updateContributor(this.model.id, attributes);
-    }
-
-  }
-
-});

app/controllers/contributors/new.js

@@ -1,16 +0,0 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-
-export default Controller.extend({
-
-  kredits: service(),
-
-  actions: {
-
-    save (contributor) {
-      return this.kredits.addContributor(contributor);
-    }
-
-  }
-
-});

app/controllers/dashboard.js

@@ -1,59 +0,0 @@
-import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { alias, gt, not, sort } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-
-export default Controller.extend({
-  kredits: service(),
-
-  showDetailsPane: false,
-  selectedContributorId: null,
-  selectedContributionId: null,
-
-  currentBlock: alias('kredits.currentBlock'),
-
-  contributions: alias('kredits.contributions'),
-  contributionsConfirmed: alias('kredits.contributionsConfirmed'),
-  contributionsUnconfirmed: alias('kredits.contributionsUnconfirmed'),
-
-  contributionsSorting: Object.freeze(['date:desc', 'time:desc', 'id:desc']),
-  contributionsUnconfirmedSorted: sort('contributionsUnconfirmed', 'contributionsSorting'),
-  contributionsConfirmedSorted: sort('contributionsConfirmed', 'contributionsSorting'),
-
-  kreditsByContributor: alias('kredits.kreditsByContributor'),
-
-  kreditsToplistSorting: computed('showUnconfirmedKredits', function(){
-    return this.showUnconfirmedKredits ? ['amountTotal:desc'] : ['amountConfirmed:desc'];
-  }),
-  kreditsToplist: sort('kreditsByContributor', 'kreditsToplistSorting'),
-
-  showUnconfirmedKredits: true,
-  hideUnconfirmedKredits: not('showUnconfirmedKredits'),
-
-  showQuickFilterUnconfirmed: false,
-  showQuickFilterConfirmed: false,
-
-  showFullContributionSync: gt('kredits.missingHistoricContributionsCount', 0),
-
-  showIntroText: computed('kredits.{hasAccounts,currentUser}', function(){
-    return (!this.kredits.hasAccounts || !this.kredits.currentUser);
-  }),
-
-  actions: {
-
-    vetoContribution (contributionId) {
-      this.kredits.veto(contributionId).then(transaction => {
-        console.debug('[controllers:index] Veto submitted to chain: '+transaction.hash);
-      });
-    },
-
-    toggleQuickFilterUnconfirmed () {
-      this.toggleProperty('showQuickFilterUnconfirmed');
-    },
-
-    toggleQuickFilterConfirmed () {
-      this.toggleProperty('showQuickFilterConfirmed');
-    }
-
-  }
-});

app/controllers/dashboard/contributions/show.js

@@ -1,12 +0,0 @@
-
-import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import config from 'kredits-web/config/environment';
-
-export default Controller.extend({
-
-  ipfsGatewayUrl: computed(function() {
-    return config.ipfs.gatewayUrl;
-  })
-
-});

app/controllers/dashboard/contributors/show.js

@@ -1,17 +0,0 @@
-import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import config from 'kredits-web/config/environment';
-
-export default Controller.extend({
-
-  roleName: computed('model.isCore', 'totalKreditsEarned', function() {
-    if (this.model.isCore) return 'Core Contributor';
-    if (this.model.totalKreditsEarned <= 5000) return 'Newcomer';
-    return 'Contributor';
-  }),
-
-  ipfsGatewayUrl: computed(function() {
-    return config.ipfs.gatewayUrl;
-  })
-
-});

app/controllers/index.js

@@ -0,0 +1,148 @@
+import Ember from 'ember';
+import Proposal from 'kredits-web/models/proposal';
+
+const {
+  computed,
+  inject: {
+    service
+  }
+} = Ember;
+
+export default Ember.Controller.extend({
+
+  kredits: service(),
+
+  contractInteractionEnabled: computed.alias('kredits.web3Provided'),
+
+  findContributorByAddress(address) {
+    return this.get('model.contributors')
+               .findBy('address', address);
+  },
+
+  proposalsOpen: function() {
+    let proposals = this.get('model.proposals')
+                        .filterBy('executed', false)
+                        .map(p => {
+                          p.set('recipientName', this.findContributorByAddress(p.get('recipientAddress')).name);
+                          return p;
+                        });
+    return proposals;
+  }.property('model.proposals.[]', 'model.proposals.@each.executed', 'model.contributors.[]'),
+
+  proposalsClosed: function() {
+    let proposals = this.get('model.proposals')
+                        .filterBy('executed', true)
+                        .map(p => {
+                          p.set('recipientName', this.findContributorByAddress(p.get('recipientAddress')).name);
+                          return p;
+                        });
+    return proposals;
+  }.property('model.proposals.[]', 'model.proposals.@each.executed', 'model.contributors.[]'),
+
+  proposalsSorting: ['id:desc'],
+  proposalsClosedSorted: Ember.computed.sort('proposalsClosed', 'proposalsSorting'),
+  proposalsOpenSorted: Ember.computed.sort('proposalsOpen', 'proposalsSorting'),
+
+  contributorsWithKredits: function() {
+    return this.get('model.contributors').filter(c => {
+      return c.get('kredits') !== 0;
+    });
+  }.property('model.contributors.@each.kredits'),
+
+  contributorsSorting: ['kredits:desc'],
+  contributorsSorted: Ember.computed.sort('contributorsWithKredits', 'contributorsSorting'),
+
+  watchContractEvents: function() {
+    let events = this.get('kredits.kreditsContract')
+                     .allEvents(/* [additionalFilterObject], */);
+
+    events.watch((error, data) => {
+      Ember.Logger.debug('[index] Received contract event', data);
+
+      switch (data.event) {
+        case 'ProposalCreated':
+          this._handleProposalCreated(data);
+          break;
+        case 'ProposalExecuted':
+          this._handleProposalExecuted(data);
+          break;
+        case 'ProposalVoted':
+          this._handleProposalVoted(data);
+          break;
+        case 'Transfer':
+          this._handleTransfer(data);
+          break;
+      }
+    });
+  }.on('init'),
+
+  _handleProposalCreated(data) {
+    if (Ember.isPresent(this.get('model.proposals')
+             .findBy('id', data.args.id.toNumber()))) {
+      Ember.Logger.debug('[index] proposal exists, not adding from event');
+      return false;
+    }
+
+    let proposal = Proposal.create({
+      id: data.args.id.toNumber(),
+      creatorAddress: data.args.creator,
+      recipientAddress: data.args.recipient,
+      recipientName: null,
+      votesCount: 0,
+      votesNeeded: 2,
+      amount: data.args.amount.toNumber(),
+      executed: false,
+      url: data.args.url,
+      ipfsHash: data.args.ipfsHash
+    });
+
+    this.get('model.proposals').pushObject(proposal);
+  },
+
+  _handleProposalExecuted(data) {
+    if (this.get('model.proposals')
+            .findBy('id', data.args.id.toNumber())
+            .get('executed')) {
+      Ember.Logger.debug('[index] proposal already executed, not adding from event');
+      return false;
+    }
+
+    this.get('model.proposals')
+        .findBy('id', data.args.id.toNumber())
+        .setProperties({
+          'executed': true,
+          'votesCount': 2 // TODO use real count
+        });
+
+    this.get('model.contributors')
+        .findBy('address', data.args.recipient)
+        .incrementProperty('kredits', data.args.amount.toNumber());
+  },
+
+  _handleProposalVoted(data) {
+    this.get('model.proposals')
+        .findBy('id', data.args.id.toNumber())
+        .incrementProperty('votesCount', 1);
+  },
+
+  _handleTransfer(data) {
+    this.get('model.contributors')
+        .findBy('address', data.args.from)
+        .incrementProperty('kredits', - data.args.value.toNumber());
+    this.get('model.contributors')
+        .findBy('address', data.args.to)
+        .incrementProperty('kredits', data.args.value.toNumber());
+  },
+
+
+  actions: {
+
+    confirmProposal(proposalId) {
+      this.get('kredits').vote(proposalId).then(transactionId => {
+        window.confirm('Vote submitted to Ethereum blockhain: '+transactionId);
+      });
+    }
+
+  }
+
+});

app/controllers/proposals/new.js

@@ -0,0 +1,29 @@
+import Ember from 'ember';
+import QueryParams from 'ember-parachute';
+
+export const queryParams = new QueryParams({
+  recipient: {
+    defaultValue: ''
+  },
+  amount: {
+    defaultValue: ''
+  },
+  url: {
+    defaultValue: ''
+  },
+  ipfsHash: {
+    defaultValue: ''
+  }
+});
+
+export default Ember.Controller.extend(queryParams.Mixin, {
+
+  contributors: null,
+
+  actions: {
+    onSave() {
+      this.transitionToRoute('index');
+    }
+  }
+
+});

app/controllers/signup/eth-account.js

@@ -1,49 +0,0 @@
-import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { alias, not } from '@ember/object/computed';
-import { isAddress } from 'web3-utils';
-import { inject as service } from '@ember/service';
-import config from 'kredits-web/config/environment';
-
-export default Controller.extend({
-
-  kredits: service(),
-
-  ethAddress: null,
-  githubAccessToken: alias('kredits.githubAccessToken'),
-
-  isValidEthAccount: computed('ethAddress', function() {
-    return isAddress(this.ethAddress);
-  }),
-
-  signupButtonDisabled: not('isValidEthAccount'),
-
-  actions: {
-
-    completeSignup () {
-      const payload = {
-        accessToken: this.githubAccessToken,
-        account: this.ethAddress
-      }
-
-      fetch(config.githubSignupUrl, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(payload)
-      })
-      .then(res => res.json())
-      .then(data => {
-        console.log('Created contributor:', data);
-
-        this.setProperties({
-          githubAccessToken: null,
-          ethAddress: null
-        });
-
-        this.transitionToRoute('signup.complete');
-      });
-    }
-
-  }
-
-});

app/controllers/signup/index.js

@@ -1,14 +0,0 @@
-import Controller from '@ember/controller';
-import config from 'kredits-web/config/environment';
-
-export default Controller.extend({
-
-  actions: {
-
-    connectGithub () {
-      window.location = config.githubConnectUrl;
-    }
-
-  }
-
-});

app/helpers/capitalize-string.js

@@ -1,7 +0,0 @@
-import Helper from '@ember/component/helper';
-
-export default Helper.extend({
-  compute([string]) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-  }
-});

app/helpers/fmt-crypto-currency.js

@@ -1,18 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export default helper(function fmtCryptoCurrency(params/*, hash*/) {
-  let fmtAmount;
-  const amount = params[0];
-  const code = params[1];
-
-  switch(code) {
-    case 'RBTC':
-      fmtAmount = amount / 1000000000000000000;
-      break;
-    case 'BTC':
-      fmtAmount = amount / 100000000;
-      break;
-  }
-
-  return fmtAmount;
-});

app/helpers/fmt-date-localized.js

@@ -1,8 +0,0 @@
-import { helper } from '@ember/component/helper';
-import getLocale from 'kredits-web/utils/get-locale';
-
-export default helper(function(dateStr) {
-  const date = new Date(dateStr);
-  const locale = getLocale();
-  return new Intl.DateTimeFormat(locale).format(date);
-});

app/helpers/fmt-fiat-currency.js

@@ -1,11 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export default helper(function fmtFiatCurrency(params) {
-  const lang = navigator.language || navigator.userLanguage;
-  const formatter = new Intl.NumberFormat(lang, {
-    style: 'currency',
-    currency: params[1] || 'EUR',
-    currencyDisplay: 'code'
-  })
-  return formatter.format(params[0]);
-});

app/helpers/is-confirmed-contribution.js

@@ -1,15 +0,0 @@
-import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
-import { alias } from '@ember/object/computed';
-
-export default Helper.extend({
-
-  kredits: service(),
-  currentBlock: alias('kredits.currentBlock'),
-
-  compute([contribution]) {
-    return !contribution.vetoed &&
-           (contribution.confirmedAt <= this.currentBlock);
-  }
-
-});

app/helpers/is-current-user.js

@@ -1,16 +0,0 @@
-import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
-import { alias } from '@ember/object/computed';
-import { isPresent } from '@ember/utils';
-
-export default Helper.extend({
-
-  kredits: service(),
-  currentUser: alias('kredits.currentUser'),
-
-  compute([contributor]) {
-    return isPresent(contributor) && isPresent(this.currentUser) &&
-            contributor.account === this.currentUser.account;
-  }
-
-});

app/helpers/item-status.js

@@ -1,56 +0,0 @@
-import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
-import { alias } from '@ember/object/computed';
-import { once } from '@ember/runloop';
-
-export default Helper.extend({
-
-  kredits: service(),
-  currentBlock: alias('kredits.currentBlock'),
-
-  compute([item]) {
-    this.setupRecompute(item);
-
-    let status = [];
-
-    if (item.vetoed) {
-      status.push('vetoed');
-    } else if (item.confirmedAt > this.currentBlock) {
-      status.push('unconfirmed');
-    } else {
-      status.push('confirmed');
-    }
-
-    if (item.hasPendingChanges) {
-      status.push('pending');
-    }
-
-    return status.join(' ');
-  },
-
-  destroy () {
-    if (this.teardown) this.teardown();
-    this._super(...arguments);
-  },
-
-  setupRecompute (item) {
-    if (this.teardown) this.teardown();
-
-    item.addObserver('vetoed' , this, this.triggerRecompute);
-    item.addObserver('confirmedAt' , this, this.triggerRecompute);
-    item.addObserver('currentBlock' , this, this.triggerRecompute);
-    item.addObserver('hasPendingChanges' , this, this.triggerRecompute);
-
-    this.teardown = () => {
-      item.removeObserver('vetoed', this, this.triggerRecompute);
-      item.removeObserver('confirmedAt', this, this.triggerRecompute);
-      item.removeObserver('currentBlock', this, this.triggerRecompute);
-      item.removeObserver('hasPendingChanges', this, this.triggerRecompute);
-    };
-  },
-
-  triggerRecompute () {
-    once(this, this.recompute);
-  }
-
-});

app/helpers/sats-to-btc.js

@@ -1,5 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export default helper(function satsToBtc(amount/*, hash*/) {
-  return amount / 100000000;
-});

app/index.html

@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">
 
     {{content-for "head-footer"}}
 

app/initializers/defer-loading.js

@@ -0,0 +1,20 @@
+/**
+ * This pauses the app's boot process until the window load event is fired.
+ * It allows the user provided Web3 instance (e.g. Metamask, Mist Browser)
+ * to be inserted before we try to use it.
+ */
+export default {
+  name: 'defer-loading',
+  initialize: function(application) {
+    // Load event already fired, so web3 should be loaded if available
+    if (window.windowLoadComplete) { return true; }
+
+    // Pause app loading
+    application.deferReadiness();
+
+    window.addEventListener('load', function() {
+      // Continue app loading
+      application.advanceReadiness();
+    });
+  }
+};

app/models/contribution.js

@@ -1,50 +1,53 @@
-import EmberObject, { computed } from '@ember/object';
+import Ember from 'ember';
-import { isEmpty, isPresent } from '@ember/utils';
-import moment from 'moment';
 
-export default EmberObject.extend({
+export default Ember.Object.extend({
-  // Contract
+
-  id: null,
+  // blockNumber: null,
+  // blockHash: null,
+  // transactionHash: null,
+  recipientAddress: null,
   contributorId: null,
-  amount: null,
-  confirmedAt: null,
-  vetoed: null,
   ipfsHash: null,
+  amount: null,
 
-  // contributor model instance
   contributor: null,
-
+  contribution: null,
-  // TODO contributor who submitted the contribution
-  // submittedBy: null,
-
-  // IPFS
   kind: null,
   description: null,
-  details: null,
   url: null,
-  date: null,
+  details: null,
-  time: null,
 
-  pendingTx: null,
+  /**
+   * Loads the contribution details from IPFS and sets local instance
+   * properties from it
+   *
+   * @method
+   * @public
+   */
+  loadDetails(ipfs) {
+    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+      ipfs.getFile(this.get('ipfsHash')).then(content => {
+        let contributionJSON = JSON.parse(content);
+        let contribution = Ember.Object.create(contributionJSON);
 
-  init () {
+        this.setProperties({
-    this._super(...arguments);
+          kind: contribution.get('kind'),
-    if (isEmpty(this.details)) this.set('details', {});
+          description: contribution.get('description'),
+          url: contribution.get('url')
+        });
+
+        // TODO load details
+        // let details = profile.get('accounts');
+
+        Ember.Logger.debug('[proposal] loaded contribution details', contributionJSON);
+        resolve();
+      }).catch((err) => {
+        Ember.Logger.error('[proposal] error trying to load contribution details', this.get('ipfsHash'), err);
+        reject(err);
+      });
+    });
+
+    return promise;
   },
 
-  iso8601Date: computed('date', 'time', function() {
-    return this.time ? `${this.date}T${this.time}` : this.date;
-  }),
-
-  jsDate: computed('iso8601Date', function() {
-    return moment(this.iso8601Date).toDate();
-  }),
-
-  hasPendingChanges: computed('pendingTx', function() {
-    return isPresent(this.pendingTx);
-  }),
-
-  serialize () {
-    return JSON.stringify(this);
-  }
 });

app/models/contributor.js

@@ -1,25 +1,119 @@
-import EmberObject from '@ember/object';
+import Ember from 'ember';
 
-export default EmberObject.extend({
+const {
-  // Contract
+  isPresent,
-  id: null,
+} = Ember;
-  account: null,
-  balance: 0,
-  totalKreditsEarned: 0,
-  contributionsCount: 0,
-  isCore: false,
-  ipfsHash: null,
 
-  // IPFS
+export default Ember.Object.extend({
-  kind: null,
+
+  address: null,
   name: null,
+  kind: null,
   url: null,
   github_username: null,
   github_uid: null,
   wiki_username: null,
-  zoom_display_name: null,
+  ipfsHash: null,
+  kredits: null,
+  isCore: false,
+  isCurrentUser: false,
 
-  serialize () {
+  avatarURL: function() {
-    return JSON.stringify(this);
+    return `https\:\/\/avatars2.githubusercontent.com/u/${this.get('github_uid')}?v=3&s=128`;
+  }.property('github_uid'),
+
+
+  /**
+   * Loads the contributor's profile data from IPFS and sets local instance
+   * properties from it
+   *
+   * @method
+   * @public
+   */
+  loadProfile(ipfs) {
+    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+      ipfs.getFile(this.get('ipfsHash')).then(content => {
+        let profileJSON = JSON.parse(content);
+        let profile = Ember.Object.create(profileJSON);
+
+        this.setProperties({
+          name: profile.get('name'),
+          kind: profile.get('kind')
+        });
+
+        let accounts = profile.get('accounts');
+        let github   = accounts.findBy('site', 'github.com');
+        let wiki     = accounts.findBy('site', 'wiki.kosmos.org');
+
+        if (isPresent(github)) {
+          this.setProperties({
+            github_username: github.username,
+            github_uid: github.uid,
+          });
+        }
+        if (isPresent(wiki)) {
+          this.setProperties({
+            wiki_username: wiki.username
+          });
+        }
+
+        Ember.Logger.debug('[contributor] loaded contributor profile', profile);
+        resolve();
+      }).catch((err) => {
+        Ember.Logger.error('[contributor] error trying to load contributor profile', this.get('ipfsHash'), err);
+        reject(err);
+      });
+    });
+
+    return promise;
+  },
+
+  /**
+   * Creates a JSON-LD object of the contributor, according to
+   * https://github.com/67P/kosmos-schemas/blob/master/schemas/contributor.json
+   *
+   * @method
+   * @public
+   */
+  toJSON() {
+    let contributor = {
+      "@context": "https://schema.kosmos.org",
+      "@type": "Contributor",
+      "kind": this.get('kind'),
+      "name": this.get('name'),
+      "accounts": []
+    };
+
+    if (Ember.isPresent(this.get('url'))) {
+      contributor["url"] = this.get('url');
+    }
+    if (Ember.isPresent(this.get('github_uid'))) {
+      contributor.accounts.push({
+        "site": "github.com",
+        "uid": this.get('github_uid'),
+        "username": this.get('github_username'),
+        "url": `https://github.com/${this.get('github_username')}`
+      });
+    }
+    if (Ember.isPresent(this.get('wiki_username'))) {
+      contributor.accounts.push({
+        "site": "wiki.kosmos.org",
+        "username": this.get('wiki_username'),
+        "url": `https://wiki.kosmos.org/User:${this.get('wiki_username')}`
+      });
+    }
+
+    return contributor;
+  },
+
+  /**
+   * Returns the JSON-LD representation of the model as a string
+   *
+   * @method
+   * @public
+   */
+  serialize() {
+    return JSON.stringify(this.toJSON());
   }
+
 });

app/models/proposal.js

@@ -0,0 +1,102 @@
+import Ember from 'ember';
+
+const {
+  isPresent,
+  isEmpty,
+} = Ember;
+
+export default Ember.Object.extend({
+
+  id: null,
+  creatorAddress: null,
+  recipientAddress: null,
+  recipientName: null,
+  recipientProfile: null,
+  votesCount: null,
+  votesNeeded: null,
+  amount: null,
+  executed: null,
+  contribution: null,
+  kind: null,
+  description: null,
+  url: null,
+  details: null,
+  ipfsHash: null,
+
+  /**
+   * Loads the contribution details from IPFS and sets local instance
+   * properties from it
+   *
+   * @method
+   * @public
+   */
+  loadContribution(ipfs) {
+    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+      ipfs.getFile(this.get('ipfsHash')).then(content => {
+        let contributionJSON = JSON.parse(content);
+        let contribution = Ember.Object.create(contributionJSON);
+
+        this.setProperties({
+          kind: contribution.get('kind'),
+          description: contribution.get('description'),
+          url: contribution.get('url')
+        });
+
+        // TODO load details
+        // let details = profile.get('accounts');
+
+        Ember.Logger.debug('[proposal] loaded contribution details', contributionJSON);
+        resolve();
+      }).catch((err) => {
+        Ember.Logger.error('[proposal] error trying to load contribution details', this.get('ipfsHash'), err);
+        reject(err);
+      });
+    });
+
+    return promise;
+  },
+
+  /**
+   * Creates a JSON-LD object of the contribution, according to
+   * https://github.com/67P/kosmos-schemas/blob/master/schemas/contribution.json
+   *
+   * @method
+   * @public
+   */
+  contributionToJSON() {
+    if (isEmpty(this.get('recipientProfile'))) {
+      throw new Error('IPFS hash for recipient profile missing from proposal object');
+    }
+    if (isEmpty(this.get('kind')) || isEmpty(this.get('description'))) {
+      throw new Error('Missing one or more required properties: kind, description');
+    }
+
+    let contribution = {
+      "@context": "https://schema.kosmos.org",
+      "@type": "Contribution",
+      "contributor": {
+        "ipfs": this.get('recipientProfile')
+      },
+      "kind": this.get('kind'),
+      "description": this.get('description'),
+      "details": {}
+    };
+
+    if (isPresent(this.get('url'))) {
+      contribution["url"] = this.get('url');
+    }
+
+    return contribution;
+  },
+
+  /**
+   * Returns the JSON-LD representation of the contribution as a string
+   *
+   * @method
+   * @public
+   */
+  serializeContribution() {
+    return JSON.stringify(this.contributionToJSON());
+  }
+
+});

app/models/reimbursement.js

@@ -1,47 +0,0 @@
-import EmberObject, { computed } from '@ember/object';
-import moment from 'moment';
-import { isPresent } from '@ember/utils';
-
-export default EmberObject.extend({
-
-  // Contract
-  id: null,
-  recipientId: null,
-  token: null,
-  amount: null,
-  confirmedAt: null,
-  vetoed: null,
-  ipfsHash: null,
-
-  // contributor model instance
-  recipient: null,
-
-  // TODO contributor who submitted the reimbursement
-  // recordedBy: null,
-
-  // IPFS
-  expenses: null, // Array of expense objects
-
-  pendingTx: null,
-
-  iso8601Date: computed('date', 'time', function() {
-    return this.time ? `${this.date}T${this.time}` : this.date;
-  }),
-
-  jsDate: computed('iso8601Date', function() {
-    return moment(this.iso8601Date).toDate();
-  }),
-
-  hasPendingChanges: computed('pendingTx', function() {
-    return isPresent(this.pendingTx);
-  }),
-
-  pendingStatus: computed('pendingTx', function() {
-    return isPresent(this.pendingTx) ? 'isPending' : 'notPending';
-  }),
-
-  serialize () {
-    return JSON.stringify(this);
-  }
-
-});

app/resolver.js

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

app/router.js

@@ -1,41 +1,16 @@
-import EmberRouter from '@ember/routing/router';
+import Ember from 'ember';
 import config from './config/environment';
 
-export default class Router extends EmberRouter {
+const Router = Ember.Router.extend({
-  location = config.locationType;
+  location: config.locationType,
-  rootURL = config.rootURL;
+  rootURL: config.rootURL
-}
+});
 
 Router.map(function() {
-  this.route('dashboard', function() {
+  this.route('spinner');
-    this.route('contributors', function() {
+  this.route('proposals', function() {
-      this.route('show', { path: ':id' });
-    });
-
-    this.route('contributions', function() {
-      this.route('show', { path: ':id' });
-    });
-  });
-  this.route('contributions', function() {
-    this.route('new', { queryParams: ['contributorId', 'kind', 'amount'] });
-    this.route('resubmit', { path: ':id/resubmit' });
-  });
-  this.route('contributors', function() {
-    this.route('new');
-    this.route('edit', { path: ':id/edit' });
-  });
-  this.route('signup', function() {
-    this.route('github');
-    this.route('eth-account');
-    this.route('complete');
-  });
-  this.route('budget', function() {
-    this.route('expenses');
-
-    this.route('reimbursements', function() {});
-  });
-
-  this.route('reimbursements', function() {
     this.route('new');
   });
 });
+
+export default Router;

app/routes/application.js

@@ -1,35 +1,4 @@
-import Route from '@ember/routing/route';
+import Ember from 'ember';
-import { inject as service } from '@ember/service';
-import { schedule } from '@ember/runloop';
 
-export default class ApplicationRoute extends Route {
+export default Ember.Route.extend({
-  @service kredits;
+});
-  @service communityFunds;
-
-  beforeModel(/* transition */) {
-    return this.kredits.setup().then(() => {
-      this.kredits.kredits.preflightChecks().catch(error => {
-        console.error('Kredits preflight check failed!');
-        console.error(error);
-      });
-    }).catch(error => {
-      console.log('Error initializing Kredits', error);
-    });
-  }
-
-  model() {
-    return this.kredits.loadInitialData().then(() => {
-      this.kredits.addContractEventHandlers()
-    });
-  }
-
-  afterModel() {
-    if (this.kredits.contributorsNeedSync) {
-      schedule('afterRender', this.kredits.syncContributors,
-        this.kredits.syncContributors.perform);
-    }
-
-    schedule('afterRender', this.communityFunds.fetchBalances,
-      this.communityFunds.fetchBalances.perform);
-  }
-}

app/routes/budget.js

@@ -1,34 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { isEmpty, isPresent } from '@ember/utils';
-import { schedule } from '@ember/runloop';
-
-export default class BudgetRoute extends Route {
-  @service browserCache;
-  @service kredits;
-
-  async model () {
-    if (isPresent(this.kredits.reimbursements) &&
-        isEmpty(this.kredits.reimbursementsPending)) {
-      console.debug('[route:budget] Reimbursements loaded before, no need to sync or load');
-      return;
-    } else {
-      const numCachedReimbursements = await this.browserCache.reimbursements.length();
-      if (numCachedReimbursements > 0) {
-        await this.kredits.loadObjectsFromCache('Reimbursement');
-        this.kredits.set('reimbursementsNeedSync', true);
-      } else {
-        await this.kredits.fetchObjects('Reimbursement', { page: { size: 10 } });
-      }
-    }
-  }
-
-  afterModel() {
-    if (this.kredits.reimbursementsNeedSync) {
-      schedule('afterRender', this.kredits.syncReimbursements,
-        this.kredits.syncReimbursements.perform);
-    }
-    schedule('afterRender', this.kredits.fetchMissingReimbursements,
-      this.kredits.fetchMissingReimbursements.perform);
-  }
-}

app/routes/budget/expenses.js

@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class BudgetExpensesRoute extends Route {
-}

app/routes/contributions/new.js

@@ -1,9 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ContributionsNewRoute extends Route {
-
-  model (params) {
-    return { params };
-  }
-
-}

app/routes/contributions/resubmit.js

@@ -1,21 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default Route.extend({
-
-  kredits: service(),
-
-  model(params) {
-    return this.kredits.contributions.findBy('id', parseInt(params.id));
-  },
-
-  setupController (controller, model) {
-    this._super(controller, model);
-
-    controller.set('attributes', model.getProperties([
-      'contributorId', 'kind', 'amount', 'description', 'url', 'details'
-    ]));
-    controller.set('attributes.date', model.jsDate);
-  }
-
-});

app/routes/contributors/edit.js

@@ -1,30 +0,0 @@
-import { inject as service } from '@ember/service';
-import Route from '@ember/routing/route';
-import { alias } from '@ember/object/computed';
-
-export default Route.extend({
-
-  kredits: service(),
-  contributors: alias('kredits.contributors'),
-
-  model(params) {
-    return this.kredits.contributors.findBy('id', params.id);
-  },
-
-  setupController (controller, model) {
-    this._super(controller, model);
-
-    controller.set('attributes', {
-      account: model.account,
-      name: model.name,
-      kind: model.kind,
-      url: model.url,
-      github_username: model.github_username,
-      github_uid: model.github_uid,
-      gitea_username: model.gitea_username,
-      wiki_username: model.wiki_username,
-      zoom_display_name: model.zoom_display_name
-    });
-  }
-
-});

app/routes/dashboard.js

@@ -1,21 +0,0 @@
-import Route from '@ember/routing/route';
-import { schedule } from '@ember/runloop';
-import { inject as service } from '@ember/service';
-
-export default class DashboardRoute extends Route {
-
-  @service kredits;
-
-  afterModel() {
-    if (this.kredits.contributionsNeedSync) {
-      schedule('afterRender', this.kredits.syncContributions,
-        this.kredits.syncContributions.perform);
-    }
-    // TODO fetch automatically under a certain threshold
-    // The browser might delete cached data and we don't need manual re-syncs
-    // depending on how little is missing
-    // schedule('afterRender', this.kredits.fetchMissingContributions,
-    //   this.kredits.fetchMissingContributions.perform);
-  }
-
-}

app/routes/dashboard/contributions/show.js

@@ -1,32 +0,0 @@
-import { inject as service } from '@ember/service';
-import Route from '@ember/routing/route';
-import { alias } from '@ember/object/computed';
-
-export default Route.extend({
-
-  kredits: service(),
-  contributions: alias('kredits.contributions'),
-
-  model (params) {
-    return this.contributions.findBy('id', parseInt(params.id));
-  },
-
-  setupController (controller, model) {
-    this._super(controller, model);
-
-    this.controllerFor('dashboard')
-        .setProperties({
-          showDetailsPane: true,
-          selectedContributionId: model.id
-        });
-  },
-
-  deactivate () {
-    this.controllerFor('dashboard')
-        .setProperties({
-          showDetailsPane: false,
-          selectedContributionId: null
-        });
-  }
-
-});

app/routes/dashboard/contributors/show.js

@@ -1,32 +0,0 @@
-import { inject as service } from '@ember/service';
-import Route from '@ember/routing/route';
-import { alias } from '@ember/object/computed';
-
-export default Route.extend({
-
-  kredits: service(),
-  contributors: alias('kredits.contributors'),
-
-  model (params) {
-    return this.contributors.findBy('id', params.id);
-  },
-
-  setupController (controller, model) {
-    this._super(controller, model);
-
-    this.controllerFor('dashboard')
-        .setProperties({
-          showDetailsPane: true,
-          selectedContributorId: model.id
-        });
-  },
-
-  deactivate () {
-    this.controllerFor('dashboard')
-        .setProperties({
-          showDetailsPane: false,
-          selectedContributorId: null
-        });
-  }
-
-});

app/routes/index.js

@@ -1,9 +1,34 @@
-import Route from '@ember/routing/route';
+import Ember from 'ember';
+import Contributor from 'kredits-web/models/contributor';
 
-export default Route.extend({
+export default Ember.Route.extend({
 
-  redirect () {
+  kredits: Ember.inject.service(),
-    this.transitionTo('dashboard');
+
+  beforeModel(transition) {
+    const kredits = this.get('kredits');
+
+    if (kredits.get('web3') && kredits.get('web3Provided')) {
+      kredits.get('web3').eth.getAccounts((error, accounts) => {
+        if (error || accounts.length === 0) {
+          if (confirm('It looks like you have an Ethereum wallet available. Please unlock your account.')) {
+            transition.retry();
+          }
+        }
+      });
+    }
+  },
+
+  model() {
+    let kredits = this.get('kredits');
+
+    return Ember.RSVP.hash({
+      contributors: kredits.getContributors(),
+      totalSupply: kredits.getValueFromContract('tokenContract', 'totalSupply'),
+      proposals: kredits.getProposals(),
+      contributions: kredits.getContributions(),
+      newContributor: Contributor.create({ kind: 'person' })
+    });
   }
 
 });

app/routes/proposals/new.js

@@ -0,0 +1,37 @@
+import Ember from 'ember';
+import Proposal from 'kredits-web/models/proposal';
+
+const {
+  Route,
+  RSVP,
+  inject: {
+    service
+  }
+} = Ember;
+
+export default Route.extend({
+
+  kredits: service(),
+
+  model(params) {
+    const proposal = Proposal.create({
+      recipientAddress: params.recipient,
+      amount: params.amount,
+      url: params.url,
+      kind: params.kind || 'dev',
+      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);
+  }
+
+});

app/routes/reimbursements/new.js

@@ -1,9 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ReimbursementsNewRoute extends Route {
-
-  model (params) {
-    return { params };
-  }
-
-}

app/routes/signup.js

@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-});

app/routes/signup/complete.js

@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-});

app/routes/signup/eth-account.js

@@ -1,17 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { isEmpty } from '@ember/utils';
-
-export default Route.extend({
-
-  kredits: service(),
-
-  redirect () {
-    this._super(...arguments);
-
-    if (isEmpty(this.kredits.githubAccessToken)) {
-      this.transitionTo('signup.index');
-    }
-  }
-
-});

app/routes/signup/github.js

@@ -1,29 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { isEmpty } from '@ember/utils';
-
-export default Route.extend({
-
-  kredits: service(),
-
-  redirect () {
-    this._super(...arguments);
-
-    let accessToken;
-    try {
-      accessToken = window.location.hash.match(/access_token=(.+)/)[1];
-    } catch (error) { /* ignore */ }
-
-    if (isEmpty(accessToken) || accessToken === 'undefined') {
-      console.error('No GitHub access token found.');
-      this.transitionTo('signup');
-      return;
-    }
-
-    this.kredits.set('githubAccessToken', accessToken);
-
-    this.transitionTo('signup.eth-account');
-  }
-
-});
-

app/routes/spinner.js

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});

app/services/browser-cache.js

@@ -1,37 +0,0 @@
-import Service from '@ember/service';
-import * as localforage from 'localforage';
-import config from 'kredits-web/config/environment';
-
-function createStore(name) {
-  let networkName;
-  if (config.web3RequiredNetworkName) {
-    networkName = config.web3RequiredNetworkName.toLocaleLowerCase().replace(' ', '-');
-  } else {
-    networkName = 'custom';
-  }
-  return localforage.createInstance({ name: `kredits:${networkName}:${name}` });
-}
-
-export default class BrowserCacheService extends Service {
-
-  constructor() {
-    super(...arguments);
-    this.stores = {
-      contributors:  createStore('contributors'),
-      contributions: createStore('contributions'),
-      reimbursements: createStore('reimbursements')
-    }
-  }
-
-  get contributors() {
-    return this.stores.contributors;
-  }
-
-  get contributions() {
-    return this.stores.contributions;
-  }
-
-  get reimbursements() {
-    return this.stores.reimbursements;
-  }
-}

app/services/community-funds.js

@@ -1,39 +0,0 @@
-import Service, { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { A } from '@ember/array';
-import { task } from 'ember-concurrency-decorators';
-import config from 'kredits-web/config/environment';
-
-export default class CommunityFundsService extends Service {
-  @service exchangeRates;
-
-  @tracked balancesLoaded = false;
-  @tracked balances = A([]);
-
-  @task
-  *fetchBalances () {
-    yield fetch(config.btcBalanceAPI).then(res => res.json())
-      .then(res => {
-        return this.processBalances(res);
-      })
-      .catch(err => {
-        console.log(`[community-funds] Fetching balances failed:`);
-        console.error(err);
-      });
-  }
-
-  async processBalances (res) {
-    await this.exchangeRates.fetchRates();
-    // Format and round the approximate USD value
-    const lang = navigator.language || navigator.userLanguage;
-    const balanceUSD = res.confirmed_balance * this.exchangeRates.btcusd;
-    res.balanceUSD = Math.round(balanceUSD).toLocaleString(lang);
-
-    this.balances.pushObject({
-      ...res,
-      ...{ token: { name: 'BTC', symbol: 'BTC'} }
-    });
-
-    this.balancesLoaded = true;
-  }
-}

app/services/exchange-rates.js

@@ -1,29 +0,0 @@
-import Service from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import config from 'kredits-web/config/environment';
-
-// Need to go through proxy for CORS headers
-const bitstampBaseUrl = `${config.corsProxy}https://www.bitstamp.net/api/v2`;
-
-async function fetchFromBitstamp(currencyPair) {
-  try {
-    const res = await fetch(`${bitstampBaseUrl}/ticker/${currencyPair}/`).then(r => r.json());
-    return parseFloat(res.vwap); // Last 24 hours volume weighted average price
-  } catch(e) {
-    console.error('Could not fetch exchange rate from Bitstamp:', e);
-    return 0;
-  }
-}
-
-export default class ExchangeRatesService extends Service {
-  @tracked btceur = 0;
-  @tracked btcusd = 0;
-
-  async fetchRates (source='bitstamp') {
-    switch(source) {
-      case 'bitstamp':
-        this.btceur = await fetchFromBitstamp('btceur');
-        this.btcusd = await fetchFromBitstamp('btcusd');
-    }
-  }
-}

app/services/ipfs.js

@@ -0,0 +1,35 @@
+import Ember from 'ember';
+import ipfsAPI from 'npm:ipfs-api';
+import config from 'kredits-web/config/environment';
+
+export default Ember.Service.extend({
+
+  ipfsInstance: null,
+
+  ipfs: function() {
+    if (this.get('ipfsInstance')) {
+      return this.get('ipfsInstance');
+    }
+    let ipfs = ipfsAPI(config.ipfs);
+    this.set('ipfsInstance', ipfs);
+    return ipfs;
+  }.property('ipfsInstance'),
+
+  storeFile(content) {
+    let ipfs = this.get('ipfs');
+    return ipfs.add(new ipfs.Buffer(content)).then(res => {
+      Ember.Logger.debug('[ipfs] stored content in IPFS', content, res[0].hash);
+      return res[0].hash;
+    });
+  },
+
+  getFile(hash) {
+    return this.get('ipfs').cat(hash, { buffer: true }).then(res => {
+      return res.toString();
+    }, err => {
+      Ember.Logger.error('[ipfs] error trying to fetch file', hash, err);
+      throw err;
+    });
+  }
+
+});

app/services/kredits.js

@@ -1,756 +1,284 @@
-import ethers from 'ethers';
+import Ember from 'ember';
-import Kredits from '@kredits/contracts';
+import Web3 from 'npm:web3';
-
-import Service from '@ember/service';
-import EmberObject from '@ember/object';
-import { computed } from '@ember/object';
-import { alias, filterBy, notEmpty, sort } from '@ember/object/computed';
-import { isEmpty, isPresent } from '@ember/utils';
-import { inject as service } from '@ember/service';
-
-import { task, taskGroup } from 'ember-concurrency';
-
-import groupBy from 'kredits-web/utils/group-by';
-import processContributorData from 'kredits-web/utils/process-contributor-data';
-import processContributionData from 'kredits-web/utils/process-contribution-data';
-import processReimbursementData from 'kredits-web/utils/process-reimbursement-data';
-import formatKredits from 'kredits-web/utils/format-kredits';
-
 import config from 'kredits-web/config/environment';
 import Contributor from 'kredits-web/models/contributor';
+import Proposal from 'kredits-web/models/proposal';
 import Contribution from 'kredits-web/models/contribution';
-import Reimbursement from 'kredits-web/models/reimbursement';
+import kreditsContracts from 'npm:kredits-contracts';
-// Lets us access the model classes dynamically
+import uuid from 'npm:uuid';
-const models = { Contributor, Contribution, Reimbursement };
+
+const {
+  Service,
+  isPresent,
+  inject: {
+    service
+  }
+} = Ember;
 
 export default Service.extend({
 
-  browserCache: service(),
+  ipfs: service(),
 
-  currentBlock: null,
+  web3Instance: null,
-  currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
+  web3Provided: false, // Web3 provided (using Mist Browser, Metamask et al.)
-  currentUser: null,
-  contributors: null,
-  contributions: null,
-  reimbursements: null,
-  githubAccessToken: null,
 
-  currentUserIsContributor: notEmpty('currentUser'),
+  web3: function() {
-  currentUserIsCore: alias('currentUser.isCore'),
+    if (this.get('web3Instance')) {
-  hasAccounts: notEmpty('currentUserAccounts'),
+      return this.get('web3Instance');
-
-  contributorsMined: filterBy('contributors', 'id'),
-  contributorsSorting: Object.freeze(['name:asc']),
-  contributorsSorted: sort('contributorsMined', 'contributorsSorting'),
-
-  // When data was loaded from cache, we need to fetch updates from the network
-  contributorsNeedSync: false,
-  contributionsNeedSync: false,
-  reimbursementsNeedSync: false,
-
-  missingHistoricContributionsCount: 0,
-
-  init () {
-    this._super(...arguments);
-    this.set('contributors', []);
-    this.set('contributions', []);
-    this.set('reimbursements', []);
-  },
-
-  // This is called in the application route's beforeModel(). So it is
-  // initialized before everything else, and we can rely on the ethProvider and
-  // the potential currentUserAccounts to be available
-  getEthProvider () {
-    let ethProvider;
-
-    return new Promise(resolve => {
-      function instantiateWithoutAccount () {
-        console.debug('[kredits] Creating new instance from npm module class');
-        console.debug(`[kredits] providerURL: ${config.web3ProviderUrl}`);
-        ethProvider = new ethers.providers.JsonRpcProvider(config.web3ProviderUrl);
-        resolve({
-          ethProvider: ethProvider,
-          ethSigner: null
-        });
-      }
-
-      async function instantiateWithAccount (web3Provider, context) {
-        console.debug('[kredits] Using user-provided Web3 instance, e.g. from Metamask');
-        ethProvider = new ethers.providers.Web3Provider(web3Provider);
-
-        const network = await ethProvider.getNetwork();
-        if (isPresent(config.web3RequiredChainId) &&
-            network.chainId !== config.web3RequiredChainId) {
-          return instantiateWithoutAccount();
-        }
-
-        ethProvider.listAccounts().then(accounts => {
-          context.set('currentUserAccounts', accounts);
-          const ethSigner = accounts.length === 0 ? null : ethProvider.getSigner();
-          resolve({
-            ethProvider,
-            ethSigner
-          });
-        });
-      }
-
-      if (window.ethereum) {
-        if (window.ethereum.isConnected()) {
-          instantiateWithAccount(window.ethereum, this);
-        } else {
-          instantiateWithoutAccount();
-        }
-      }
-      // Legacy dapp browsers...
-      else if (window.web3) {
-        instantiateWithAccount(window.web3.currentProvider, this);
-      }
-      // Non-dapp browsers...
-      else {
-        instantiateWithoutAccount();
-      }
-    });
-  },
-
-  async setup () {
-    const kredits = await this.getEthProvider().then(providerAndSigner => {
-      return new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
-        ipfsConfig: config.ipfs
-      });
-    });
-
-    await kredits.init();
-    this.set('kredits', kredits);
-    this.set('currentBlock', await this.kredits.provider.getBlockNumber());
-    this.kredits.provider.on('block', blockNumber => {
-      console.debug('[kredits] New block mined:', blockNumber);
-      this.set('currentBlock', blockNumber)
-    });
-
-    if (this.currentUserAccounts && this.currentUserAccounts.length > 0) {
-      this.getCurrentUser.then(contributorData => {
-        this.set('currentUser', contributorData);
-      });
     }
 
-    return kredits;
+    let web3Instance;
-  },
 
-  getCurrentUser: computed('kredits.provider', 'currentUserAccounts.[]', function() {
+    if (typeof window.web3 !== 'undefined') {
-    if (isEmpty(this.currentUserAccounts)) {
+      Ember.Logger.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
-      return Promise.resolve();
+      web3Instance = window.web3;
-    }
+      this.set('web3Provided', true);
-    return this.kredits.Contributor
-      .functions.getContributorIdByAddress(this.currentUserAccounts.firstObject)
-      .then((id) => {
-        // check if the user is a contributor or not
-        if (id === 0) {
-          return Promise.resolve();
-        } else {
-          return this.kredits.Contributor.getById(id);
-        }
-      });
-  }),
-
-  totalSupply: computed(function() {
-    return this.kredits.Token.functions.totalSupply().then(total => {
-      return formatKredits(total);
-    })
-  }),
-
-  totalKreditsEarned: computed(function() {
-    return this.kredits.Contribution.functions.totalKreditsEarned(true);
-  }),
-
-  kreditsByContributor: computed('contributionsUnconfirmed.@each.vetoed', 'contributors.[]', function() {
-    const contributionsUnconfirmed = this.contributionsUnconfirmed.filterBy('vetoed', false);
-    const contributionsGrouped = groupBy(contributionsUnconfirmed, 'contributorId');
-    const contributorsWithUnconfirmed = contributionsGrouped.map(c => c.value);
-    const contributorsWithOnlyConfirmed = this.contributors.reject(c => contributorsWithUnconfirmed.includes(c.id))
-
-    const kreditsByContributor = contributionsGrouped.map(c => {
-      const amountUnconfirmed = c.items.mapBy('amount').reduce((a, b) => a + b);
-      const contributor = this.contributors.findBy('id', c.value);
-
-      return EmberObject.create({
-        contributor: contributor,
-        amountUnconfirmed: amountUnconfirmed,
-        amountConfirmed: contributor.totalKreditsEarned,
-        amountTotal: contributor.totalKreditsEarned + amountUnconfirmed
-      })
-    });
-
-    contributorsWithOnlyConfirmed.forEach(c => {
-      kreditsByContributor.push(EmberObject.create({
-        contributor: c,
-        amountUnconfirmed: 0,
-        amountConfirmed: c.totalKreditsEarned,
-        amountTotal: c.totalKreditsEarned
-      }));
-    })
-
-    return kreditsByContributor;
-  }),
-
-  contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
-    return this.contributions
-               .filter(c => c.confirmedAt > this.currentBlock);
-  }),
-
-  contributionsConfirmed: computed('contributions.[]', 'currentBlock', function() {
-    return this.contributions
-               .filterBy('vetoed', false)
-               .filter(c => c.confirmedAt <= this.currentBlock);
-  }),
-
-  reimbursementsUnconfirmed: computed('reimbursements.[]', 'currentBlock', function() {
-    return this.reimbursements
-               .filter(r => r.confirmedAt > this.currentBlock);
-  }),
-
-  reimbursementsConfirmed: computed('reimbursements.[]', 'currentBlock', function() {
-    return this.reimbursements
-               .filterBy('vetoed', false)
-               .filter(r => r.confirmedAt <= this.currentBlock);
-  }),
-
-  reimbursementsPending: computed('reimbursements.[]', 'pendingTx', function() {
-    return this.reimbursements.filter(r => !r.id);
-  }),
-
-  async loadInitialData () {
-    const numCachedContributors = await this.browserCache.contributors.length();
-    if (numCachedContributors > 0) {
-      await this.loadObjectsFromCache('Contributor');
-      this.set('contributorsNeedSync', true);
     } else {
-      await this.fetchContributors();
+      Ember.Logger.debug('[kredits] Creating new instance from npm module class');
+      let providerUrl = localStorage.getItem('config:web3ProviderUrl') || config.web3ProviderUrl;
+      let provider = new Web3.providers.HttpProvider(providerUrl);
+      web3Instance = new Web3(provider);
     }
 
-    const numCachedContributions = await this.browserCache.contributions.length();
+    this.set('web3Instance', web3Instance);
-    if (numCachedContributions > 0) {
+    window.web3 = web3Instance;
-      await this.loadObjectsFromCache('Contribution');
+
-      this.set('contributionsNeedSync', true);
+    return web3Instance;
+  }.property('web3Instance'),
+
+  currentUserAccounts: function() {
+    return (this.get('web3Provided') && this.get('web3').eth.accounts) || [];
+  }.property('web3Provided', 'web3'),
+
+  initializeKreditsContract() {
+    let contract = null;
+
+    if (isPresent(config.contractMetadata)) {
+      if (localStorage.getItem('config:networkId')) {
+        config.contractMetadata['networkId'] = localStorage.getItem('config:networkId');
+      }
+      contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
     } else {
-      await this.fetchContributions({ page: { size: 40 } });
+      contract = kreditsContracts(this.get('web3'))['Kredits'];
     }
 
-    await this.updateMissingHistoricContributionsCount();
+    return contract;
-
-    return Promise.resolve();
   },
 
-  async updateMissingHistoricContributionsCount () {
+  kreditsContract: function() {
-    const contributionsCount = await this.kredits.Contribution.count;
+    if (this.get('kreditsContractInstance')) {
-    this.set('missingHistoricContributionsCount', contributionsCount - this.contributions.length);
+      return this.get('kreditsContractInstance');
-    console.debug(`Missing ${this.missingHistoricContributionsCount} historic contributions (out of ${contributionsCount} overall)`)
-  },
-
-  addContributor (attributes) {
-    if (attributes.github_uid) {
-      const uidInt = parseInt(attributes.github_uid);
-      attributes.github_uid = uidInt;
     }
 
-    console.debug('[kredits] add contributor', attributes);
+    let contract = this.initializeKreditsContract();
 
-    return this.kredits.Contributor.add(attributes, { gasLimit: 350000 })
+    this.set('kreditsContractInstance', contract);
-      .then(data => {
+    // window.Kredits = contract;
-        console.debug('[kredits] add contributor response', data);
+    return contract;
+  }.property('kreditsContractInstance', 'web3'),
+
+  tokenContract: function() {
+    if (this.get('tokenContractInstance')) {
+      return this.get('tokenContractInstance');
+    }
+
+    let contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Token'];
+    this.set('tokenContractInstance', contract);
+    window.Token = contract;
+    return contract;
+  }.property('tokenContractInstance', 'web3'),
+
+  getValueFromContract(contract, contractMethod, ...args) {
+    Ember.Logger.debug('[kredits] read from contract', contract);
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      this.get(contract)[contractMethod](...args, (err, data) => {
+        if (err) { reject(err); return; }
+        resolve(data);
       });
-  },
-
-  updateContributor (id, attributes) {
-    if (attributes.github_uid) {
-      const uidInt = parseInt(attributes.github_uid);
-      attributes.github_uid = uidInt;
-    }
-
-    console.debug('[kredits] update contributor', attributes);
-
-    return this.kredits.Contributor.updateProfile(id, attributes, { gasLimit: 350000 })
-      .then(data => {
-        console.debug('[kredits] updateProfile response', data);
-      });
-  },
-
-  fetchContributors () {
-    console.debug(`[kredits] Fetching all contributors from the network`);
-    return this.kredits.Contributor.all()
-      .then(contributors => {
-        return contributors.forEach(data => {
-          this.loadContributorFromData(data);
-          return;
-        });
-      })
-      .then(() => {
-        return this.cacheLoadedContributors();
-      });
-  },
-
-  loadContributorFromData (data) {
-    const contributor = Contributor.create(processContributorData(data));
-    const loadedContributor = this.contributors.findBy('id', contributor.id);
-    if (loadedContributor) { this.contributors.removeObject(loadedContributor); }
-    this.contributors.pushObject(contributor);
-    return contributor;
-  },
-
-  async cacheLoadedContributors () {
-    for (const c of this.contributors) {
-      await this.browserCache.contributors.setItem(c.id.toString(), c.serialize());
-    }
-    console.debug(`[kredits] Cached ${this.contributors.length} contributors in browser storage`);
-    return Promise.resolve();
-  },
-
-  async loadContributorsFromCache () {
-    return this.browserCache.contributors.iterate((value/*, key , iterationNumber */) => {
-      this.contributors.pushObject(Contributor.create(JSON.parse(value)));
-    }).then((/* result */) => {
-      console.debug(`[kredits] Loaded ${this.contributors.length} contributors from cache`);
     });
   },
 
-  syncContributors: task(function * () {
+  getContributorData(i) {
-    yield this.fetchContributors();
+    let promise = new Ember.RSVP.Promise((resolve, reject) => {
-    this.set('contributorsNeedSync', false);
+      this.getValueFromContract('kreditsContract', 'contributorAddresses', i).then(address => {
-  }),
+        this.getValueFromContract('kreditsContract', 'contributors', address).then(person => {
+          this.getValueFromContract('tokenContract', 'balanceOf', address).then(balance => {
+            Ember.Logger.debug('[kredits] person', address, person);
 
-  addContribution (attributes) {
+            let contributor = Contributor.create({
-    console.debug('[kredits] Adding contribution', attributes);
+              address: address,
-
+              ipfsHash: person[2],
-    return this.kredits.Contribution.add(attributes, { gasLimit: 300000 })
+              kredits: balance.toNumber(),
-      .then(data => {
+              isCurrentUser: this.get('currentUserAccounts').includes(address)
-        console.debug('[kredits] Contribution.add response', data);
-        attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
-        const contribution = Contribution.create(attributes);
-        contribution.set('pendingTx', data);
-        contribution.set('confirmedAtBlock', this.currentBlock + 40320);
-        this.contributions.pushObject(contribution);
-        return contribution;
-      });
-  },
-
-  fetchContributions (options = { page: { size: 200 } }) {
-    console.debug(`[kredits] Fetching contributions from the network`);
-    return this.kredits.Contribution.all(options)
-      .then(contributions => {
-        return contributions.map(data => {
-          const contribution = this.loadContributionFromData(data);
-          return contribution;
-        });
-      })
-      .then(contributions => {
-        const cacheWrites = contributions.map(c => {
-          return this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
-        });
-        return Promise.all(cacheWrites).then(() => {
-          console.debug(`[kredits] Cached ${contributions.length} contributions in browser storage`);
-        });
-      });
-  },
-
-  loadContributionFromData(data) {
-    const contribution = Contribution.create(processContributionData(data));
-    contribution.set('contributor', this.contributors.findBy('id', data.contributorId));
-    const loadedContribution = this.contributions.findBy('id', contribution.id);
-    if (loadedContribution) { this.contributions.removeObject(loadedContribution); }
-    this.contributions.pushObject(contribution);
-    return contribution;
-  },
-
-  async cacheLoadedContributions () {
-    for (const c of this.contributions) {
-      await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
-    }
-    console.debug(`[kredits] Cached ${this.contributions.length} contributions in browser storage`);
-    return Promise.resolve();
-  },
-
-  async loadContributionsFromCache () {
-    return this.browserCache.contributions.iterate((value/*, key , iterationNumber */) => {
-      this.contributions.pushObject(Contribution.create(JSON.parse(value)));
-    }).then((/* result */) => {
-      console.debug(`[kredits] Loaded ${this.contributions.length} contributions from cache`);
-    });
-  },
-
-  contributionTasks: taskGroup().enqueue(),
-
-  syncContributions: task(function * () {
-    yield this.fetchNewContributions.perform();
-    yield this.syncUnconfirmedContributions.perform();
-    yield this.updateMissingHistoricContributionsCount();
-    this.set('contributionsNeedSync', false);
-  }).group('contributionTasks'),
-
-  fetchNewContributions: task(function * () {
-    const count = yield this.kredits.Contribution.count;
-    const lastKnownContributionId = Math.max.apply(null, this.contributions.mapBy('id'));
-    const toFetch = count - lastKnownContributionId;
-
-    if (toFetch > 0) {
-      console.debug(`[kredits] Fetching ${toFetch} new contributions`);
-      for (let id = lastKnownContributionId; id <= count; id++) {
-        const data = yield this.kredits.Contribution.getById(id);
-        const c = this.loadContributionFromData(data);
-        yield this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
-      }
-    } else {
-      console.debug(`[kredits] No new contributions to fetch`);
-    }
-  }),
-
-  fetchMissingContributions: task(function * () {
-    const count = yield this.kredits.Contribution.count;
-    const allIds = [...Array(count+1).keys()];
-    allIds.shift(); // remove first item, which is 0
-    const loadedContributions = new Set(this.contributions.mapBy('id'));
-    const toFetch = allIds.filter(id => !loadedContributions.has(id));
-    if (toFetch.length === 0) {
-      console.debug(`[kredits] No contributions left to fetch`);
-      return;
-    }
-    console.debug(`[kredits] Fetching ${toFetch.length} past contributions`);
-    let countFetched = 0;
-
-    for (let id = count; id > 0; id--) {
-      if (loadedContributions.has(id)) {
-        continue;
-      } else {
-        const data = yield this.kredits.Contribution.getById(id);
-        const c = this.loadContributionFromData(data);
-        yield this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
-        countFetched++;
-        if (countFetched % 20 === 0) {
-          console.debug(`[kredits] Fetched ${countFetched} more contributions`);
-        }
-      }
-    }
-    console.debug(`[kredits] Cached ${countFetched} past contributions`);
-  }).group('contributionTasks'),
-
-  syncUnconfirmedContributions: task(function * () {
-    if (this.contributionsUnconfirmed.length > 0) {
-      console.debug(`[kredits] Syncing unconfirmed contributions`);
-      for (const c of this.contributionsUnconfirmed) {
-        const data = yield this.kredits.Contribution.getById(c.id);
-        const contribution = this.loadContributionFromData(data);
-        yield this.browserCache.contributions.setItem(c.id.toString(), contribution.serialize());
-      }
-    } else {
-      console.debug(`[kredits] No unconfirmed contributions to sync`);
-    }
-  }),
-
-  veto (contributionId) {
-    console.debug('[kredits] veto against', contributionId);
-    const contribution = this.contributions.findBy('id', contributionId);
-
-    return this.kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
-      .then(data => {
-        console.debug('[kredits] veto response', data);
-        contribution.set('pendingTx', data);
-        return data;
-      });
-  },
-
-  //
-  // Generic data handling (for objects that can be vetoed)
-  //
-
-  fetchObjects(objectClass, options = { page: { size: 200 } }) {
-    const objectClassLowerCase = objectClass.toLowerCase();
-    console.debug(`[kredits] Fetching ${objectClassLowerCase}s from the network`);
-    return this.kredits[objectClass].all(options)
-      .then(objects => {
-        return objects.map(data => {
-          const classInstance = this[`load${objectClass}FromData`](data);
-          return classInstance;
-        });
-      })
-      .then(objects => {
-        const cacheWrites = objects.map(o => {
-          return this.browserCache[objectClassLowerCase+'s']
-                     .setItem(o.id.toString(), o.serialize());
-        });
-        return Promise.all(cacheWrites).then(() => {
-          console.debug(`[kredits] Cached ${objects.length} ${objectClassLowerCase+'s'} in browser storage`);
-        });
-      });
-  },
-
-  removeObjectFromCollectionIfLoaded (collection, objectId) {
-    const loadedObj = this[collection].findBy('id', objectId);
-    if (loadedObj) { this[collection].removeObject(loadedObj); }
-  },
-
-  async cacheLoadedObjects (collection) {
-    for (const o of this[collection]) {
-      await this.browserCache[collection].setItem(o.id, o.serialize());
-    }
-    console.debug(`[kredits] Cached ${this[collection].length} ${collection} in browser storage`);
-  },
-
-  async loadObjectsFromCache (objectClass) {
-    const collection = objectClass.toLowerCase()+'s';
-    return this.browserCache[collection].iterate((value/*, key , iterationNumber */) => {
-      const obj = models[objectClass].create(JSON.parse(value));
-      this.removeObjectFromCollectionIfLoaded(collection, obj.id)
-      this[collection].pushObject(obj);
-    }).then((/* result */) => {
-      console.debug(`[kredits] Loaded ${this[collection].length} ${collection} from cache`);
-    });
-  },
-
-  syncTaskGroup: taskGroup().enqueue(),
-
-  fetchNewObjects: task(function * (objectClass) {
-    const collection = objectClass.toLowerCase()+'s';
-    const count = yield this.kredits[objectClass].functions[`${collection}Count`]();
-    const lastKnownObjectId = Math.max.apply(null, this[collection].mapBy('id'));
-    const toFetch = count - lastKnownObjectId;
-
-    if (toFetch > 0) {
-      console.debug(`[kredits] Fetching ${toFetch} new ${collection}`);
-      for (let id = lastKnownObjectId; id <= count; id++) {
-        const data = yield this.kredits[objectClass].getById(id);
-        const o = this[`load${objectClass}FromData`](data);
-        yield this.browserCache[collection].setItem(o.id.toString(), o.serialize());
-      }
-    } else {
-      console.debug(`[kredits] No new ${collection} to fetch`);
-    }
-  }),
-
-  fetchMissingObjects: task(function * (objectClass) {
-    const collection = objectClass.toLowerCase()+'s';
-    const count = yield this.kredits[objectClass].functions[`${collection}Count`]();
-    const allIds = [...Array(count+1).keys()];
-    allIds.shift(); // remove first item, which is 0
-    const loadedObjects = new Set(this[collection].mapBy('id'));
-    const toFetch = allIds.filter(id => !loadedObjects.has(id));
-    if (toFetch.length === 0) {
-      console.debug(`[kredits] No ${collection} left to fetch`);
-      return;
-    }
-    console.debug(`[kredits] Fetching ${toFetch.length} past ${collection}`);
-    let countFetched = 0;
-
-    for (let id = count; id > 0; id--) {
-      if (loadedObjects.has(id)) {
-        continue;
-      } else {
-        const data = yield this.kredits[objectClass].getById(id);
-        const o = this[`load${objectClass}FromData`](data);
-        yield this.browserCache[collection].setItem(o.id.toString(), o.serialize());
-        countFetched++;
-        if (countFetched % 20 === 0) {
-          console.debug(`[kredits] Fetched ${countFetched} more ${collection}`);
-        }
-      }
-    }
-    console.debug(`[kredits] Cached ${countFetched} past ${collection}`);
-  }),
-
-  syncUnconfirmedObjects: task(function * (objectClass) {
-    const collection = objectClass.toLowerCase()+'s';
-    if (this.get(`${collection}Unconfirmed`).length > 0) {
-      console.debug(`[kredits] Syncing unconfirmed ${collection}`);
-      for (const o of this[`${collection}Unconfirmed`]) {
-        if (isEmpty(o.id)) return;
-        const data = yield this.kredits[objectClass].getById(o.id);
-        const object = this[`load${objectClass}FromData`](data);
-        yield this.browserCache[collection]
-                  .setItem(o.id.toString(), object.serialize());
-      }
-    } else {
-      console.debug(`[kredits] No unconfirmed ${collection} to sync`);
-    }
-  }),
-
-  vetoAgainstObject (objectClass, objectId) {
-    console.debug(`[kredits] veto against ${objectClass.toLowerCase()}`, objectId);
-    const collection = objectClass.toLowerCase()+'s';
-    const object = this[collection].findBy('id', objectId);
-
-    return this.kredits[objectClass].functions.veto(objectId, { gasLimit: 300000 })
-      .then(data => {
-        console.debug('[kredits] veto response', data);
-        object.set('pendingTx', data);
-        return data;
-      });
-  },
-
-  //
-  // Reimbursements
-  //
-
-  loadReimbursementFromData(data) {
-    const obj = Reimbursement.create(processReimbursementData(data));
-    obj.set('contributor', this.contributors.findBy('id', data.recipientId));
-    this.removeObjectFromCollectionIfLoaded('reimbursements', obj.id);
-    this.reimbursements.pushObject(obj);
-    return obj;
-  },
-
-  addReimbursement (attributes) {
-    console.debug('[kredits] add reimbursement', attributes);
-
-    return this.kredits.Reimbursement.add(attributes, { gasLimit: 300000 })
-      .then(data => {
-        console.debug('[kredits] add reimbursement response', data);
-        const reimbursement = Reimbursement.create(attributes);
-        reimbursement.setProperties({
-          contributor: this.contributors.findBy('id', attributes.recipientId),
-          pendingTx: data,
-          confirmedAt: this.currentBlock + 40320
-        });
-        this.reimbursements.pushObject(reimbursement);
-
-        // Listen to tx mining/execution status
-        data.wait()
-            .then(d => console.debug('[kredits] tx successful', d))
-            .catch(e => {
-              window.alert('The transaction failed to execute. Please check the browser console.');
-              console.log('[kredits] tx error', e);
             });
 
-        return reimbursement;
+            contributor.loadProfile(this.get('ipfs')).then(
+              () => resolve(contributor),
+              err => reject(err)
+            );
+          });
+        });
+      }).catch(err => reject(err));
+    });
+    return promise;
+  },
+
+  getContributors() {
+    return this.getValueFromContract('kreditsContract', 'contributorsCount').then(contributorsCount => {
+      let contributors = [];
+
+      for(var i = 0; i < contributorsCount.toNumber(); i++) {
+        contributors.push(this.getContributorData(i));
+      }
+
+      return Ember.RSVP.all(contributors);
+    });
+  },
+
+  getProposalData(i) {
+    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+      this.getValueFromContract('kreditsContract', 'proposals', i).then(p => {
+        let proposal = Proposal.create({
+          id               : i,
+          creatorAddress   : p[0],
+          recipientAddress : p[1],
+          votesCount       : p[2].toNumber(),
+          votesNeeded      : p[3].toNumber(),
+          amount           : p[4].toNumber(),
+          executed         : p[5],
+          url              : p[6],
+          ipfsHash         : p[7]
+        });
+
+        if (proposal.get('ipfsHash')) {
+          proposal.loadContribution(this.get('ipfs')).then(
+            () => resolve(proposal),
+            err => reject(err)
+          );
+        } else {
+          Ember.Logger.warn('[kredits] proposal from blockchain is missing IPFS hash', proposal);
+          resolve(proposal);
+        }
+      }).catch(err => reject(err));
+    });
+    return promise;
+  },
+
+  getProposals() {
+    return this.getValueFromContract('kreditsContract', 'proposalsCount').then(proposalsCount => {
+      let proposals = [];
+
+      for(var i = 0; i < proposalsCount.toNumber(); i++) {
+        proposals.push(this.getProposalData(i));
+      }
+
+      return Ember.RSVP.all(proposals);
+    });
+  },
+
+  vote(proposalId) {
+    Ember.Logger.debug('[kredits] vote for', proposalId);
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      this.get('kreditsContract').vote(proposalId, (err, data) => {
+        if (err) { reject(err); return; }
+        Ember.Logger.debug('[kredits] vote response', data);
+        resolve(data);
       });
+    });
   },
 
-  syncReimbursements: task(function * () {
+  addContributor(contributor) {
-    yield this.fetchNewObjects.perform('Reimbursement');
+    Ember.Logger.debug('[kredits] add contributor', contributor);
-    yield this.syncUnconfirmedObjects.perform('Reimbursement');
-    this.set('reimbursementsNeedSync', false);
-  }).group('syncTaskGroup'),
 
-  fetchMissingReimbursements: task(function * () {
+    contributor.setProperties({
-    yield this.fetchMissingObjects.perform('Reimbursement');
+      kredits: 0,
-  }).group('syncTaskGroup'),
+      isCurrentUser: this.get('currentUserAccounts').includes(contributor.address)
-
-  vetoReimbursement (id) {
-    console.debug('[kredits] veto against reimbursement', id);
-    const reimbursement = this.reimbursements.findBy('id', id);
-
-    return this.kredits.Reimbursement.functions.veto(id, { gasLimit: 300000 })
-      .then(data => {
-        console.debug('[kredits] veto response', data);
-        reimbursement.set('pendingTx', data);
-        return data;
-      });
-  },
-
-  //
-  // Contract events
-  //
-
-  addContractEventHandlers () {
-    this.kredits.Contributor
-      .on('ContributorProfileUpdated', this.handleContributorChange.bind(this))
-      .on('ContributorAccountUpdated', this.handleContributorChange.bind(this))
-      .on('ContributorAdded', this.handleContributorChange.bind(this))
-
-    this.kredits.Contribution
-      .on('ContributionAdded', this.handleContributionAdded.bind(this))
-      .on('ContributionVetoed', this.handleContributionVetoed.bind(this))
-
-    this.kredits.Reimbursement
-      .on('ReimbursementAdded', this.handleReimbursementAdded.bind(this))
-      .on('ReimbursementVetoed', this.handleReimbursementVetoed.bind(this))
-
-    this.kredits.Token
-      .on('Transfer', this.handleTransfer.bind(this));
-  },
-
-  async handleContributorChange (contributorId, ...args) {
-    console.debug('[kredits] Contributor add/update event received for ID', contributorId);
-    console.debug('[kredits] Event data:', args);
-    const contributorData = await this.kredits.Contributor.getById(contributorId);
-    const newContributor = Contributor.create(contributorData);
-
-    // TODO check for actual differences in the contributor data first
-
-    const oldContributor = this.contributors.findBy('id', contributorId);
-    if (oldContributor) {
-      // console.debug('[kredits] cached contributor', oldContributor);
-      this.contributors.removeObject(oldContributor);
-    }
-
-    // console.debug('[kredits] incoming contributor data', newContributor);
-    this.contributors.pushObject(newContributor);
-  },
-
-  async handleContributionAdded (id, contributorId, amount) {
-    console.debug('[kredits] ContributionAdded event received', { id, contributorId, amount });
-
-    const pendingContribution = this.contributions.find(c => {
-      return (c.id === null) &&
-             (c.contributorId === contributorId) &&
-             (c.amount.toString() === amount.toString());
     });
 
-    if (pendingContribution) {
+    let id = uuid.v4();
-      this.contributions.removeObject(pendingContribution);
-    }
 
-    const data = await this.kredits.Contribution.getById(id);
+    return new Ember.RSVP.Promise((resolve, reject) => {
-    const c = this.loadContributionFromData(data);
+      this.get('ipfs').storeFile(contributor.serialize()).then(ipfsHash => {
-    await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+        contributor.set('ipfsHash', ipfsHash);
-  },
+        this.get('kreditsContract').addContributor(contributor.address, contributor.name, contributor.ipfsHash, contributor.isCore, id, (err, data) => {
-
+          if (err) { reject(err); return; }
-  async handleContributionVetoed (contributionId) {
+          Ember.Logger.debug('[kredits] add contributor response', data);
-    console.debug('[kredits] ContributionVetoed event received for #', contributionId);
+          resolve(contributor);
-    const c = this.contributions.findBy('id', contributionId);
+        });
-
+      });
-    if (c) {
-      console.debug('[kredits] Updating contribution', c);
-      c.set('vetoed', true);
-      c.set('pendingTx', null);
-      await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
-    }
-  },
-
-  async handleReimbursementAdded (id, addedByAccount, amount) {
-    console.debug('[kredits] ReimbursementAdded event received', { id, addedByAccount, amount });
-
-    const pendingReimbursement = this.reimbursementsPending.find(r => {
-      return r.amount.toString() === amount.toString();
     });
-
-    if (pendingReimbursement) {
-      console.debug('[kredits] Found a pending reimbursement matching the event. Replacing it with the final record...');
-      this.reimbursements.removeObject(pendingReimbursement);
-    }
-
-    const data = await this.kredits.Reimbursement.getById(id);
-    const r = this.loadReimbursementFromData(data);
-    this.browserCache.reimbursements.setItem(r.id.toString(), r.serialize());
   },
 
-  async handleReimbursementVetoed (id) {
+  addProposal(proposal) {
-    console.debug(`[kredits] ReimbursementVetoed received for #${id}`);
+    return new Ember.RSVP.Promise((resolve, reject) => {
-    const r = this.reimbursements.findBy('id', id);
+      const {
-    console.debug('[kredits] reimbursement', r);
+        recipientAddress,
+        amount,
+        url
+      } = proposal.getProperties('recipientAddress', 'amount', 'url');
 
-    if (r) {
+      this.get('ipfs').storeFile(proposal.serializeContribution()).then(ipfsHash => {
-      r.set('vetoed', true);
+        this.get('kreditsContract').addProposal(recipientAddress, amount, url, ipfsHash, (err, data) => {
-      r.set('pendingTx', null);
+          if (err) { reject(err); return; }
-      this.browserCache.reimbursements.setItem(r.id.toString(), r.serialize());
+          Ember.Logger.debug('[kredits] add proposal response', data);
-    }
+          resolve();
+        });
+      });
+    });
   },
 
-  handleTransfer (from, to, value) {
+  getTokenMintedEvents(fromBlock=0, toBlock='latest') {
-    value = value.toNumber();
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      const minted = this.get('tokenContract')
+                         .Minted({}, {fromBlock: fromBlock, toBlock: toBlock});
 
-    this.contributors
+      minted.get((err, res) => {
-        .findBy('address', from)
+        if (err) {
-        .decrementProperty('balance', value);
+          Ember.Logger.error('[kredits] Error reading Token#Minted events', res);
+          reject(err);
+          return;
+        }
+        Ember.Logger.warn('[kredits] Token#Minted events', res);
+        resolve(res);
+      });
+    });
+  },
+
+  getContributions() {
+    // this.getTokenMintedEvents().then(events => {
+      let contributions = [];
+
+      config.fixtures.mintedEvents.forEach(mintedEvent => {
+        contributions.push(this.getContributionData(mintedEvent));
+      });
+
+      return Ember.RSVP.all(contributions);
+    // });
+  },
+
+  getContributionData(mintedEvent) {
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      let contribution = Contribution.create({
+        recipientAddress: mintedEvent.args.recipientAddress,
+        contributorId: mintedEvent.args.contributorId,
+        amount: mintedEvent.args.amount,
+        ipfsHash: mintedEvent.args.reference
+      });
+
+      if (contribution.get('ipfsHash')) {
+        contribution.loadDetails(this.get('ipfs')).then(
+          () => resolve(contribution),
+          err => reject(err)
+        );
+      } else {
+        Ember.Logger.warn('[kredits] contribution from Minted event is missing IPFS hash', contribution);
+        resolve(contribution);
+      }
+    });
+  },
+
+  // logKreditsContract: function() {
+  //   Ember.Logger.debug('[kredits] kreditsContract', this.get('kreditsContract'));
+  // }.on('init')
 
-    this.contributors
-        .findBy('address', to)
-        .incrementProperty('balance', value);
-  }
 });

app/styles/_buttons.scss

@@ -1,95 +0,0 @@
-button, input[type=submit], .button {
-  display: inline-block;
-  padding: 0.6rem 2rem;
-  background-color: rgba(22, 21, 40, 0.6);
-  border: 1px solid rgba(22, 21, 40, 1);
-  border-radius: 3px;
-  color: $primary-color;
-  font-weight: 500;
-  text-decoration: none;
-  text-transform: uppercase;
-  cursor: pointer;
-  letter-spacing: 0.1em;
-  -webkit-appearance: none;
-
-  &+button, &+input[type=submit], &+.button {
-    margin-left: 0.5rem;
-  }
-
-  &:hover {
-    background-color: rgba(22, 21, 40, 0.8);
-  }
-
-  &:focus, &:active, &.active {
-    border-color: $primary-color;
-  }
-
-  &[disabled] {
-    color: rgba(255,255,255,0.5);
-  }
-
-  &.small {
-    font-size: 0.86rem;
-    padding: 0.2rem 0.8rem;
-
-    svg {
-      width: 1em;
-      height: 1em;
-      vertical-align: middle;
-      margin-right: 0.4rem;
-    }
-  }
-
-  &.danger:not(:disabled) {
-    color: $red;
-    background-color: rgba(40, 21, 21, 0.6);
-    border-color: rgba(40, 21, 21, 1);
-    &:hover { background-color: rgba(40, 21, 21, 0.8); }
-    &:focus, &:active, &.active { border-color: $red; }
-  }
-
-  &.green:not(:disabled) {
-    color: $green;
-    background-color: rgba(21, 40, 21, 0.6);
-    border-color: rgba(21, 40, 21, 1);
-    &:hover { background-color: rgba(21, 40, 21, 0.8); }
-    &:focus, &:active, &.active { border-color: $green; }
-  }
-
-  &.pink:not(:disabled) {
-    color: $pink;
-    background-color: rgba(40, 21, 40, 0.6);
-    border-color: rgba(40, 21, 40, 1);
-    &:hover { background-color: rgba(40, 21, 40, 0.8); }
-    &:focus, &:active, &.active { border-color: $pink; }
-  }
-
-  &.purple:not(:disabled) {
-    color: $purple;
-    background-color: rgba(24, 21, 40, 0.6);
-    border-color: rgba(24, 21, 40, 1);
-    &:hover { background-color: rgba(24, 21, 40, 0.8); }
-    &:focus, &:active, &.active { border-color: $purple; }
-  }
-
-  &.yellow:not(:disabled) {
-    color: $yellow;
-    background-color: rgba(40, 40, 21, 0.6);
-    border-color: rgba(40, 40, 21, 1);
-    &:hover { background-color: rgba(40, 40, 21, 0.8); }
-    &:focus, &:active, &.active { border-color: $yellow; }
-  }
-
-  &.icon {
-    svg {
-      width: 2rem;
-      height: 2rem;
-      vertical-align: middle;
-      margin-right: 1rem;
-
-      .fg {
-        fill: $primary-color;
-      }
-    }
-  }
-}

app/styles/_colors.scss

@@ -5,10 +5,4 @@ $green: #97fb68;
 $yellow: #fbe468;
 $red: #fb6868;
 
-$primary-color: $blue;
+$primaryColor: $blue;
-
-$body-text-color: #fff;
-
-$item-background-color: rgba(255,255,255,0.1);
-$item-highlighted-background-color: rgba(255,255,255,0.2);
-$item-border-color: rgba(255,255,255,0.2);

app/styles/_item-list.scss

@@ -1,35 +0,0 @@
-ul.item-list {
-  list-style: none;
-
-  > li {
-    padding: 0.8rem 1.2rem;
-    font-size: 1.2rem;
-    background-color: $item-background-color;
-    border-bottom: 1px solid $item-border-color;
-
-    &:first-of-type {
-      border-top: 1px solid $item-border-color;
-    }
-
-    &.selected {
-      background-color: $item-highlighted-background-color;
-    }
-  }
-
-  &.loading {
-    @include loading-border-top;
-
-    > li {
-      &:first-of-type {
-        border-top: none;
-      }
-    }
-  }
-
-  &.spaced {
-    > li {
-      border-top: 1px solid $item-border-color;
-      margin-bottom: 2rem;
-    }
-  }
-}