Show contribution history from events

Get contributions from minted events (WIP)
Update deps
2017-08-14 17:33:38 +02:00 · 2017-08-14 17:15:11 +02:00 · 2017-08-14 17:14:17 +02:00
190 changed files with 2256 additions and 50253 deletions
@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "analytics": false
+}
@@ -4,6 +4,7 @@

 root = true

+
 [*]
 end_of_line = lf
 charset = utf-8
@@ -5,5 +5,5 @@

    Setting `disableAnalytics` to true will prevent any data from being sent.
  */
-  "disableAnalytics": true
+  "disableAnalytics": false
 }
@@ -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
@@ -1,63 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  parser: 'babel-eslint',
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: 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-observers': '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'
-      })
-    }
-  ]
-};
@@ -1,4 +0,0 @@
-template: |
-  ## Changes
-
-  $CHANGES
@@ -1,26 +1,17 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.

 # compiled output
-/dist/
-/tmp/
+/dist
+/tmp

 # dependencies
-/bower_components/
-/node_modules/
+/node_modules
+/bower_components

 # misc
-/.env*
-/.pnp*
 /.sass-cache
 /connect.lock
-/coverage/
+/coverage/*
 /libpeerconnection.log
-/npm-debug.log*
-/testem.log
-/yarn-error.log
-.tm_properties
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
+npm-debug.log*
+testem.log
@@ -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
+}
@@ -1,93 +0,0 @@
-'use strict';
-
-module.exports = {
-  extends: 'octane',
-
-  rules: {
-    'simple-unless': false,
-    'no-nested-interactive': 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/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"
-			]
-		}
-	]
-};
@@ -1,27 +1,25 @@
 ---
 language: node_js
 node_js:
-  - "10"
+  - "6"

 sudo: false
-dist: xenial

-notifications:
-  email:
-    on_success: never
-    on_failure: always
+cache:
+  directories:
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache

-addons:
-  chrome: stable
+before_install:
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version

-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
-
-branches:
-  only:
-    - master
+install:
+  - npm install
+  - bower install

 script:
  - npm test
@@ -10,24 +10,22 @@ A short introduction of this app could easily go here.
 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/)
+* [PhantomJS](http://phantomjs.org/)

 ## 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`

 ## 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

@@ -38,12 +36,6 @@ Make use of the many generators for code, try `ember help generate` for more det
 * `ember test`
 * `ember test --server`

-### Linting
-
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
-
 ### Building

 * `ember build` (development)
@@ -51,72 +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

-The smart contracts and their JavaScript wrapper library are developed in the
-[kredits-contracts](https://github.com/67P/kredits-contracts) repo/package.
+For development you might want to run your own development chain with your own development contracts.
+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 Ethereum
-network, provided e.g. by [ganache](http://truffleframework.com/ganache/).
+Start your parity node with a KreditsChain: 
+    
+    npm run kredits-parity

-[kredits-contracts](https://github.com/67P/kredits-contracts) holds all the tools
-to start and set up such a simulated network, as well as to deploy smart
-contracts to it.
+Deploy the contracts to your local chain: 

-These are the basic steps to get up and running:
+    npm run kredits-deploy

-#### 1. IPFS
+Run kredits-web with your localy deployed contracts: 

-Run a local IPFS deamon.
+    KREDITS_CONTRACT_ADDR=`kredits-inspect -c Kredits -r -w address` \
+    TOKEN_CONTRACT_ADDR=`kredits-inspect -c Token -r -w address` \
+    npm start

-  * Make sure CORS headers are configured. See [IPFS](#ipfs) for more info.
-  * `ipfs daemon`
+    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.
+    

-#### 2. kredits-contracts
-
-Get your local Ethereum development node running. (See [kredits-contracts 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` - bootstrap runs deploys all the contracts
-  * `npm link` - make the `kredits-contracts` module linkable as `kredits-contracts` on your machine (currently broken :( )
-
-#### 3. kredits-web
-
-With IPFS and Ethereum/ganache running, you can now start this Ember app.
-
-  * `npm link kredits-contracts` - link the local `kredits-contracts` package
-  * `npm run start:local` - WEB3_PROVIDER_URL=http://localhost:7545 must be set for local settings
-
-If you restart the devchain your network ID changes. So kredits-contracts does not find the correct DAO address.
-If that is the case the DAO address must be provided as `KREDITS_DAO_ADDRESS` environment variable.
-
-  * `npm run dao:address` in the kredits-contracts repo to find your address
-  * `KREDITS_DAO_ADDRESS=<0xYOURADDRESS> npm run start:local`
-
-#### 4. Metamask network
-
-Switch the network in Metamask to "Custom RPC" with the RPC URL `http://localhost:7545`.
-
-#### IPFS
-
-Install IPFS with your favorite package manager and run
-
-    ipfs init (on initial installation)
-    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)
@@ -1,12 +1,18 @@
-import Application from '@ember/application';
-import Resolver from 'ember-resolver';
+import Ember from 'ember';
+import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';

-export default class App extends Application {
-  modulePrefix = config.modulePrefix;
-  podModulePrefix = config.podModulePrefix;
-  Resolver = Resolver;
-}
+let App;
+
+Ember.MODEL_FACTORY_INJECTIONS = true;
+
+App = Ember.Application.extend({
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
+  Resolver
+});

 loadInitializers(App, config.modulePrefix);
+
+export default App;
@@ -1,78 +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';
-
-export default Component.extend({
-
-  attributes: null,
-  contributors: Object.freeze([]),
-
-  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));
-
-      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));
-    }
-
-  }
-
-});
@@ -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 @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>
-
@@ -1,91 +1,79 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-import { and, notEmpty } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-import { isPresent } from '@ember/utils';
-import { isAddress } from 'web3-utils';
+import Ember from 'ember';
+import Contributor from 'kredits-web/models/contributor';
+
+const {
+  Component,
+  isPresent,
+  inject: {
+    service
+  },
+  computed
+} = Ember;

 export default Component.extend({

-  router: service(),
  kredits: service(),

-  attributes: null,
+  newContributor: null,
+  inProgress: false,

-  isValidAccount: computed('account', function() {
-    return isAddress(this.account);
-  }),
+  isValidAddress: function() {
+    return this.get('kredits.web3')
+               .isAddress(this.get('newContributor.address'));
+  }.property('kredits.web3', 'newContributor.address'),

-  isValidName: notEmpty('name'),
-  isValidURL: notEmpty('url'),
-  isValidGithubUID: notEmpty('github_uid'),
-  isValidGithubUsername: notEmpty('github_username'),
-  isValidGiteaUsername: notEmpty('gitea_username'),
-  isValidWikiUsername: notEmpty('wiki_username'),
-  isValidZoomDisplayName: notEmpty('zoom_display_name'),
+  isValidName: function() {
+    return isPresent(this.get('newContributor.name'));
+  }.property('newContributor.name'),

-  isValid: and(
-    'isValidAccount',
+  isValidURL: function() {
+    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) {
-      evt.preventDefault();
-
-      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.');
+    save() {
+      if (!this.get('contractInteractionEnabled')) {
+        alert('Only core team members can add new contributors. Please ask someone to set you up.');
        return;
      }

-      const attributes = Object.keys(this.attributes);
-      const contributor = this.getProperties(attributes);
+      if (this.get('isValid')) {
+        this.set('inProgress', true);

-      this.set('inProgress', true);
-
-      this.save(contributor).then(() => {
-        this.reset();
-      }).catch(err => {
-        console.warn(err);
-        window.alert('Something went wrong. Please check the browser console.');
-      }).finally(() => {
-        this.set('inProgress', false);
-        this.router.transitionTo('dashboard');
-      });
+        this.get('kredits').addContributor(this.get('newContributor')).then(contributor => {
+          this.reset();
+          this.get('contributors').pushObject(contributor);
+          window.scroll(0,0);
+        });
+      } else {
+        alert('Invalid data. Please review and try again.');
+      }
    }

  }
@@ -1,56 +1,59 @@
-<form onsubmit={{action "submit"}}>
+<form {{action "save" on="submit"}}>
  <p>
-    <label for="c-account">Ethereum account</label>
-      <Input @type="text"
-             @value={{this.account}}
-             name="account" id="c-account"
-             placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-             class={{if this.isValidAccount "valid" ""}} />
+    {{input type="checkbox" name="is-core" id="is-core" checked=newContributor.isCore}}
+    <label for="is-core" class="checkbox">
+      Core team member (can add contributors)
+    </label>
  </p>
  <p>
-    <label for="c-kind">Kind</label>
-    <select required onchange={{action (mut this.kind) value="target.value"}} id="c-kind">
-      <option value="person" selected={{eq this.kind "person"}}>Person</option>
-      <option value="organization" selected={{eq this.kind "organization"}}>Organization</option>
+    {{input name="address"
+            type="text"
+            placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
+            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" type="text" value=this.name placeholder="Zero Cool"
-            class=(if this.isValidName "valid" "") id="c-name"}}
+    {{input name="name"
+            type="text"
+            placeholder="Name"
+            value=newContributor.name
+            class=(if isValidName 'valid' '')}}
  </p>
  <p>
-    <label for="c-url">URL</label>
-    {{input name="url" type="text" value=this.url placeholder="http://zerocool.bit"
-            class=(if this.isValidURL "valid" "") id="c-url"}}
+    {{input name="url"
+            type="text"
+            placeholder="URL"
+            value=newContributor.url
+            class=(if isValidURL 'valid' '')}}
  </p>
  <p>
-    <label for="c-github-uid">GitHub UID</label>
-    {{input name="github_uid" type="text" value=this.github_uid placeholder="2342"
-            class=(if this.isValidGithubUID "valid" "") id="c-github-uid"}}
+    {{input name="github_uid"
+            type="text"
+            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" type="text" value=this.github_username placeholder="zerocool"
-            class=(if this.isValidGithubUsername "valid" "") id="c-github-username"}}
+    {{input name="github_username"
+            type="text"
+            placeholder="GitHub username"
+            value=newContributor.github_username
+            class=(if isValidGithubUsername 'valid' '')}}
  </p>
  <p>
-    <label for="c-gitea-username">Gitea username</label>
-    {{input name="gitea_username" type="text" value=this.gitea_username placeholder="zerocool"
-            class=(if this.isValidGiteaUsername "valid" "") id="c-gitea-username"}}
-  </p>
-  <p>
-    <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"}}
+    {{input name="wiki_username"
+            type="text"
+            placeholder="Wiki Username"
+            value=newContributor.wiki_username
+            class=(if isValidWikiUsername 'valid' '')}}
  </p>
  <p class="actions">
-    {{input type="submit" disabled=this.inProgress
-            value=(if this.inProgress "Processing" "Save")}}
+    {{input type="submit" value=(if inProgress 'Processing' 'Save') disabled=inProgress}}
  </p>
 </form>
@@ -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);
+        });
+    }
+  }
+
+});
@@ -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>
+
@@ -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'
-      ],
-    }
-  })
-
-});
@@ -1,6 +0,0 @@
-<div class="chart">
-  <EmberChart @type="doughnut"
-              @data={{this.chartData}}
-              @options={{this.chartOptions}}
-              @width="200" @height="200" />
-</div>
@@ -1,70 +1,16 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-import { sort } from '@ember/object/computed';
-import { isPresent } from '@ember/utils';
-import { inject as service } from '@ember/service';
+import Ember from 'ember';

-export default Component.extend({
+export default Ember.Component.extend({

-  router: service(),
+  tagName: 'ul',
+  classNames: ['contribution-list'],

-  tagName: 'div',
-  classNames: ['contributions'],
-
-  selectedContribution: null,
-
-  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')
-                                                .map(id => id.toString()));
-
-    return this.contributors.filter(c => activeIds.has(c.id.toString()));
-  }),
-
-  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.toString() !== this.contributorId.toString()) { included = false; }
-
-      if (isPresent(this.contributionKind) &&
-          c.kind !== this.contributionKind) { included = false; }
-
-      return included;
+  contributionsWithContributors: function() {
+    return this.get('contributions').map((c) => {
+      c.set('contributor', this.get('contributors')
+                               .findBy('address', c.get('recipientAddress')));
+      return c;
    });
-  }),
-
-  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);
-    }
-
-  }
+  }.property('contributions.@each')

 });
@@ -1,56 +1,7 @@
-{{#if @showQuickFilter}}
-  <div class="quick-filter">
-    <p>
-      <label class="filter-contributor">
-        Contributor:
-        <select onchange={{action (mut this.contributorId) value="target.value"}}>
-          <option value="" selected>all</option>
-          {{#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="contribution-list {{if @loading 'loading'}}">
-  {{#each this.contributionsFiltered as |contribution|}}
-    <li role="button" data-contribution-id={{contribution.id}}
-        {{action "openContributionDetails" contribution}}
-        class="{{contribution-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>
+{{#each contributionsWithContributors as |contribution|}}
+  <li title="({{contribution.kind}}) {{contribution.description}}">
+    <span class="category {{contribution.kind}}">♥</span>
+    <span class="amount">{{contribution.amount}}</span><span class="symbol">₭S</span>
+    for <span class="recipient">{{contribution.contributor.name}}</span>
+  </li>
+{{/each}}
@@ -1,18 +1,22 @@
-import Component from '@ember/component';
-import { inject as service } from '@ember/service';
+import Ember from 'ember';

-export default Component.extend({
-  tagName: '',
+export default Ember.Component.extend({

-  router: service(),
-
-  selectedContributorId: null,
+  tagName: 'table',
+  classNames: 'contributor-list',
+  selectedContributor: null,

  actions: {

-    openContributorDetails(contributor) {
-      this.router.transitionTo('dashboard.contributors.show', contributor);
+    toggleContributorInfo(contributor) {
+      if (contributor.get('showMetadata')) {
+        contributor.set('showMetadata', false);
+      } else {
+        this.get('contributors').setEach('showMetadata', false);
+        contributor.set('showMetadata', true);
+      }
    }

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

@@ -2,7 +2,7 @@
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
       version="1.1" x="0px" y="0px" viewBox="0 0 132 100"
       enable-background="new 0 0 100 100" xml:space="preserve">
-    <path id="path-comet"
+    <path id="path-comet" 
          d="M79.062,24.173L79.062,24.173l-0.021-0.011c-0.068-0.03-0.137-0.062-0.204-0.093L42.392,7.337
             c0,0,3.065,14.104,4.458,18.019l0,0c0,0-41.754-12.481-46.85-13.67c1.67,6.52,30.607,62.492,30.607,62.492
             c5.848,11.873,19.394,18.485,33.522,18.485c19.811,0,35.87-16.059,35.87-35.869C100,42.313,91.418,29.837,79.062,24.173z">
@@ -10,5 +10,5 @@
  </svg>
 </p>
 <p>
-  Loading data...
+  Loading data from Ethereum...
 </p>
@@ -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.');
+      }
+    }
+
+  }
+
+});
@@ -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}}
@@ -1,46 +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);
-        this.router.transitionTo('dashboard');
-      } catch (error) {
-        this.set('setupInProgress', false);
-        console.log('Opening Ethereum wallet failed:', error);
-      }
-    }
-
-  }
-
-});
@@ -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>
@@ -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 '';
-    }
-  })
-
-});
@@ -1,6 +1,4 @@
-import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import Ember from 'ember';

-export default Controller.extend({
-  kredits: service(),
+export default Ember.Controller.extend({
 });
@@ -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;
-        });
-    }
-
-  }
-
-});
@@ -1,7 +0,0 @@
-import ContributionsNewController from 'kredits-web/controllers/contributions/new';
-
-export default ContributionsNewController.extend({
-
-  attributes: null,
-
-});
@@ -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);
-    }
-
-  }
-
-});
@@ -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);
-    }
-
-  }
-
-});
@@ -1,57 +0,0 @@
-import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { alias, 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,
-
-  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 Ethereum blockhain: '+transaction.hash);
-      });
-    },
-
-    toggleQuickFilterUnconfirmed () {
-      this.toggleProperty('showQuickFilterUnconfirmed');
-    },
-
-    toggleQuickFilterConfirmed () {
-      this.toggleProperty('showQuickFilterConfirmed');
-    }
-
-  }
-});
@@ -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;
-  })
-
-});
@@ -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;
-  })
-
-});
@@ -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);
+      });
+    }
+
+  }
+
+});
@@ -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');
+    }
+  }
+
+});
@@ -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');
-      });
-    }
-
-  }
-
-});
@@ -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;
-    }
-
-  }
-
-});
@@ -1,7 +0,0 @@
-import Helper from '@ember/component/helper';
-
-export default Helper.extend({
-  compute([string]) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-  }
-});
@@ -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([contribution]) {
-    this.setupRecompute(contribution);
-
-    let status = [];
-
-    if (contribution.vetoed) {
-      status.push('vetoed');
-    } else if (contribution.confirmedAt > this.currentBlock) {
-      status.push('unconfirmed');
-    } else {
-      status.push('confirmed');
-    }
-
-    if (contribution.hasPendingChanges) {
-      status.push('pending');
-    }
-
-    return status.join(' ');
-  },
-
-  destroy () {
-    if (this.teardown) this.teardown();
-    this._super(...arguments);
-  },
-
-  setupRecompute (contribution) {
-    if (this.teardown) this.teardown();
-
-    contribution.addObserver('vetoed' , this, this.triggerRecompute);
-    contribution.addObserver('confirmedAt' , this, this.triggerRecompute);
-    contribution.addObserver('currentBlock' , this, this.triggerRecompute);
-    contribution.addObserver('hasPendingChanges' , this, this.triggerRecompute);
-
-    this.teardown = () => {
-      contribution.removeObserver('vetoed', this, this.triggerRecompute);
-      contribution.removeObserver('confirmedAt', this, this.triggerRecompute);
-      contribution.removeObserver('currentBlock', this, this.triggerRecompute);
-      contribution.removeObserver('hasPendingChanges', this, this.triggerRecompute);
-    };
-  },
-
-  triggerRecompute () {
-    once(this, this.recompute);
-  }
-
-});
@@ -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);
-  }
-
-});
@@ -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;
-  }
-
-});
@@ -9,8 +9,8 @@

    {{content-for "head"}}

-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">

    {{content-for "head-footer"}}

@@ -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();
+    });
+  }
+};
@@ -1,52 +1,53 @@
-import EmberObject, { computed } from '@ember/object';
-import { isEmpty, isPresent } from '@ember/utils';
-import moment from 'moment';
+import Ember from 'ember';

-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,
-
-  // TODO contributor who submitted the contribution
-  // submittedBy: null,
-
-  // IPFS
+  contribution: null,
  kind: null,
  description: null,
-  details: null,
  url: null,
-  date: null,
-  time: null,
+  details: 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._super(...arguments);
-    if (isEmpty(this.details)) this.set('details', {});
+        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;
  },

-  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);
-  }
-
 });
@@ -1,26 +1,119 @@
-import EmberObject from '@ember/object';
+import Ember from 'ember';

-export default EmberObject.extend({
-  // Contract
-  id: null,
-  account: null,
-  balance: 0,
-  totalKreditsEarned: 0,
-  contributionsCount: 0,
-  isCore: false,
-  ipfsHash: null,
+const {
+  isPresent,
+} = Ember;

-  // IPFS
-  kind: null,
+export default Ember.Object.extend({
+
+  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 () {
-    return JSON.stringify(this);
+  avatarURL: function() {
+    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());
  }

 });
@@ -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());
+  }
+
+});
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;
@@ -1,32 +1,16 @@
-import EmberRouter from '@ember/routing/router';
+import Ember from 'ember';
 import config from './config/environment';

-export default class Router extends EmberRouter {
-  location = config.locationType;
-  rootURL = config.rootURL;
-}
+const Router = Ember.Router.extend({
+  location: config.locationType,
+  rootURL: config.rootURL
+});

 Router.map(function() {
-  this.route('dashboard', function() {
-    this.route('contributors', 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('spinner');
+  this.route('proposals', function() {
    this.route('new');
-    this.route('edit', { path: ':id/edit' });
-  });
-  this.route('signup', function() {
-    this.route('github');
-    this.route('eth-account');
-    this.route('complete');
  });
 });
+
+export default Router;
@@ -1,39 +1,4 @@
-import { inject as service } from '@ember/service';
-import Route from '@ember/routing/route';
-import { schedule } from '@ember/runloop';
+import Ember from 'ember';

-export default Route.extend({
-  kredits: service(),
-
-  beforeModel(/* transition */) {
-    const kredits = this.kredits;
-
-    return kredits.setup().then(() => {
-      kredits.get('kredits').preflightChecks().catch((error) => {
-        console.error('Kredits preflight check failed!');
-        console.error(error);
-      });
-    }).catch((error) => {
-      console.log('Error initializing Kredits', error);
-    });
-  },
-
-  afterModel() {
-    return this.kredits.loadInitialData()
-      .then(() => {
-        this.kredits.addContractEventHandlers();
-      })
-      .then(() => {
-        if (this.kredits.contributorsNeedSync) {
-          schedule('afterRender', this.kredits.syncContributors,
-                   this.kredits.syncContributors.perform);
-        }
-        if (this.kredits.contributionsNeedSync) {
-          schedule('afterRender', this.kredits.syncContributions,
-                   this.kredits.syncContributions.perform);
-        }
-        schedule('afterRender', this.kredits.fetchMissingContributions,
-                 this.kredits.fetchMissingContributions.perform);
-      });
-  }
+export default Ember.Route.extend({
 });
@@ -1,9 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-
-  model (params) {
-    return { params };
-  }
-
-});
@@ -1,25 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-
-export default Route.extend({
-
-  kredits: service(),
-
-  model(params) {
-    const contribution = this.kredits.contributions.findBy('id', parseInt(params.id));
-    contribution.contributorId = contribution.contributorId.toString();
-
-    return contribution;
-  },
-
-  setupController (controller, model) {
-    this._super(controller, model);
-
-    controller.set('attributes', model.getProperties([
-      'kind', 'amount', 'description', 'url', 'details'
-    ]));
-    controller.set('attributes.contributorId', model.contributorId.toString());
-    controller.set('attributes.date', model.jsDate);
-  }
-
-});
@@ -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
-    });
-  }
-
-});
@@ -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
-        });
-  }
-
-});
@@ -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
-        });
-  }
-
-});
@@ -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 () {
-    this.transitionTo('dashboard');
+  kredits: Ember.inject.service(),
+
+  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' })
+    });
  }

 });
@@ -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);
+  }
+
+});
@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-});
@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-});
@@ -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');
-    }
-  }
-
-});
@@ -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');
-  }
-
-});
-
@@ -0,0 +1,4 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
@@ -1,27 +0,0 @@
-import Service from '@ember/service';
-import * as localforage from 'localforage';
-import config from 'kredits-web/config/environment';
-
-function createStore(name) {
-  const networkName = config.web3RequiredNetwork || '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')
-    }
-  }
-
-  get contributors() {
-    return this.stores.contributors;
-  }
-
-  get contributions() {
-    return this.stores.contributions;
-  }
-}
@@ -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;
+    });
+  }
+
+});
@@ -1,496 +1,284 @@
-import ethers from 'ethers';
-import Kredits from 'kredits-contracts';
-
-import Service from '@ember/service';
-import EmberObject from '@ember/object';
-import { computed } from '@ember/object';
-import { alias, notEmpty } 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 formatKredits from 'kredits-web/utils/format-kredits';
-
+import Ember from 'ember';
+import Web3 from 'npm:web3';
 import config from 'kredits-web/config/environment';
-import Contributor from 'kredits-web/models/contributor'
-import Contribution from 'kredits-web/models/contribution'
+import Contributor from 'kredits-web/models/contributor';
+import Proposal from 'kredits-web/models/proposal';
+import Contribution from 'kredits-web/models/contribution';
+import kreditsContracts from 'npm:kredits-contracts';
+import uuid from 'npm:uuid';
+
+const {
+  Service,
+  isPresent,
+  inject: {
+    service
+  }
+} = Ember;

 export default Service.extend({

-  browserCache: service(),
+  ipfs: service(),

-  currentBlock: null,
-  currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
-  currentUser: null,
-  contributors: null,
-  contributions: null,
-  githubAccessToken: null,
+  web3Instance: null,
+  web3Provided: false, // Web3 provided (using Mist Browser, Metamask et al.)

-  currentUserIsContributor: notEmpty('currentUser'),
-  currentUserIsCore: alias('currentUser.isCore'),
-  hasAccounts: notEmpty('currentUserAccounts'),
+  web3: function() {
+    if (this.get('web3Instance')) {
+      return this.get('web3Instance');
+    }

-  // When data was loaded from cache, we need to fetch updates from the network
-  contributorsNeedSync: false,
-  contributionsNeedSync: false,
+    let web3Instance;

-  contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
-    return this.contributions.filter(contribution => {
-      return contribution.confirmedAt > this.currentBlock;
-    });
-  }),
+    if (typeof window.web3 !== 'undefined') {
+      Ember.Logger.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
+      web3Instance = window.web3;
+      this.set('web3Provided', true);
+    } else {
+      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);
+    }

-  contributionsConfirmed: computed('contributions.[]', 'currentBlock', function() {
-    return this.contributions
-               .filterBy('vetoed', false)
-               .filter(contribution => {
-                 return contribution.confirmedAt <= this.currentBlock;
-               });
-  }),
+    this.set('web3Instance', web3Instance);
+    window.web3 = web3Instance;

-  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.toString());
-    const contributorsWithOnlyConfirmed = this.contributors.reject(c => contributorsWithUnconfirmed.includes(c.id))
+    return web3Instance;
+  }.property('web3Instance'),

-    const kreditsByContributor = contributionsGrouped.map(c => {
-      const amountUnconfirmed = c.items.mapBy('amount').reduce((a, b) => a + b);
-      const contributor = this.contributors.findBy('id', c.value.toString());
+  currentUserAccounts: function() {
+    return (this.get('web3Provided') && this.get('web3').eth.accounts) || [];
+  }.property('web3Provided', 'web3'),

-      return EmberObject.create({
-        contributor: contributor,
-        amountUnconfirmed: amountUnconfirmed,
-        amountConfirmed: contributor.totalKreditsEarned,
-        amountTotal: contributor.totalKreditsEarned + amountUnconfirmed
-      })
-    });
+  initializeKreditsContract() {
+    let contract = null;

-    contributorsWithOnlyConfirmed.forEach(c => {
-      kreditsByContributor.push(EmberObject.create({
-        contributor: c,
-        amountUnconfirmed: 0,
-        amountConfirmed: c.totalKreditsEarned,
-        amountTotal: c.totalKreditsEarned
-      }));
-    })
+    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 {
+      contract = kreditsContracts(this.get('web3'))['Kredits'];
+    }

-    return kreditsByContributor;
-  }),
-
-  init () {
-    this._super(...arguments);
-    this.set('contributors', []);
-    this.set('contributions', []);
+    return contract;
  },

-  // 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;
+  kreditsContract: function() {
+    if (this.get('kreditsContractInstance')) {
+      return this.get('kreditsContractInstance');
+    }

-    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
-        });
-      }
+    let contract = this.initializeKreditsContract();

-      async function instantiateWithAccount (web3Provider, context) {
-        console.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
-        ethProvider = new ethers.providers.Web3Provider(web3Provider);
+    this.set('kreditsContractInstance', contract);
+    // window.Kredits = contract;
+    return contract;
+  }.property('kreditsContractInstance', 'web3'),

-        const network = await ethProvider.getNetwork();
-        if (isPresent(config.web3RequiredNetwork) &&
-            network.name !== config.web3RequiredNetwork) {
-          window.alert(`Please switch your Ethereum wallet to the "${config.web3RequiredNetwork}" network before connecting your account.`);
-          return instantiateWithoutAccount();
-        }
+  tokenContract: function() {
+    if (this.get('tokenContractInstance')) {
+      return this.get('tokenContractInstance');
+    }

-        ethProvider.listAccounts().then(accounts => {
-          context.set('currentUserAccounts', accounts);
-          const ethSigner = accounts.length === 0 ? null : ethProvider.getSigner();
-          resolve({
-            ethProvider,
-            ethSigner
+    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);
+      });
+    });
+  },
+
+  getContributorData(i) {
+    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+      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);
+
+            let contributor = Contributor.create({
+              address: address,
+              ipfsHash: person[2],
+              kredits: balance.toNumber(),
+              isCurrentUser: this.get('currentUserAccounts').includes(address)
+            });
+
+            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));
      }

-      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();
-      }
+      return Ember.RSVP.all(contributors);
    });
  },

-  setup () {
-    return this.getEthProvider().then((providerAndSigner) => {
-      let kredits = new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
-        addresses: { Kernel: config.kreditsKernelAddress },
-        apm: config.kreditsApmDomain,
-        ipfsConfig: config.ipfs
-      });
-      return kredits
-        .init()
-        .then(async (kredits) => {
-          this.set('kredits', kredits);
-          this.set('currentBlock', await kredits.provider.getBlockNumber());
-
-          if (this.currentUserAccounts && this.currentUserAccounts.length > 0) {
-            this.getCurrentUser.then((contributorData) => {
-              this.set('currentUser', contributorData);
-            });
-          }
-
-          return kredits;
+  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);
    });
  },

-  totalSupply: computed(function() {
-    return this.kredits.Token.functions.totalSupply().then(total => {
-      return formatKredits(total);
-    })
-  }),
-
-  totalKreditsEarned: computed(function() {
-    return this.kredits.Contribution.functions.totalKreditsEarned(true)
-      .then(total => total.toNumber());
-  }),
-
-  async loadInitialData () {
-    const numCachedContributors = await this.browserCache.contributors.length();
-    if (numCachedContributors > 0) {
-      await this.loadContributorsFromCache();
-      this.set('contributorsNeedSync', true);
-    } else {
-      await this.fetchContributors();
-    }
-
-    const numCachedContributions = await this.browserCache.contributions.length();
-    if (numCachedContributions > 0) {
-      await this.loadContributionsFromCache();
-      this.set('contributionsNeedSync', true);
-    } else {
-      await this.fetchContributions({ page: { size: 30 } });
-    }
-
-    return Promise.resolve();
-  },
-
-  addContributor (attributes) {
-    if (attributes.github_uid) {
-      const uidInt = parseInt(attributes.github_uid);
-      attributes.github_uid = uidInt;
-    }
-
-    console.debug('[kredits] add contributor', attributes);
-
-    return this.kredits.Contributor.add(attributes, { gasLimit: 350000 })
-      .then(data => {
-        console.debug('[kredits] add contributor response', data);
+  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);
      });
+    });
  },

-  updateContributor (id, attributes) {
-    if (attributes.github_uid) {
-      const uidInt = parseInt(attributes.github_uid);
-      attributes.github_uid = uidInt;
-    }
+  addContributor(contributor) {
+    Ember.Logger.debug('[kredits] add contributor', contributor);

-    console.debug('[kredits] update contributor', attributes);
+    contributor.setProperties({
+      kredits: 0,
+      isCurrentUser: this.get('currentUserAccounts').includes(contributor.address)
+    });

-    return this.kredits.Contributor.updateProfile(id, attributes, { gasLimit: 350000 })
-      .then(data => {
-        console.debug('[kredits] updateProfile response', data);
+    let id = uuid.v4();
+
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      this.get('ipfs').storeFile(contributor.serialize()).then(ipfsHash => {
+        contributor.set('ipfsHash', ipfsHash);
+        this.get('kreditsContract').addContributor(contributor.address, contributor.name, contributor.ipfsHash, contributor.isCore, id, (err, data) => {
+          if (err) { reject(err); return; }
+          Ember.Logger.debug('[kredits] add contributor response', data);
+          resolve(contributor);
+        });
      });
+    });
  },

-  fetchContributors () {
-    console.debug(`[kredits] Fetching all contributors from the network`);
-    return this.kredits.Contributor.all()
-      .then(contributors => {
-        return contributors.forEach(data => {
-          this.loadContributorFromData(data);
+  addProposal(proposal) {
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      const {
+        recipientAddress,
+        amount,
+        url
+      } = proposal.getProperties('recipientAddress', 'amount', 'url');
+
+      this.get('ipfs').storeFile(proposal.serializeContribution()).then(ipfsHash => {
+        this.get('kreditsContract').addProposal(recipientAddress, amount, url, ipfsHash, (err, data) => {
+          if (err) { reject(err); return; }
+          Ember.Logger.debug('[kredits] add proposal response', data);
+          resolve();
+        });
+      });
+    });
+  },
+
+  getTokenMintedEvents(fromBlock=0, toBlock='latest') {
+    return new Ember.RSVP.Promise((resolve, reject) => {
+      const minted = this.get('tokenContract')
+                         .Minted({}, {fromBlock: fromBlock, toBlock: toBlock});
+
+      minted.get((err, res) => {
+        if (err) {
+          Ember.Logger.error('[kredits] Error reading Token#Minted events', res);
+          reject(err);
          return;
-        });
-      })
-      .then(() => {
-        return this.cacheLoadedContributors();
+        }
+        Ember.Logger.warn('[kredits] Token#Minted events', res);
+        resolve(res);
      });
-  },
-
-  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, 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 * () {
-    yield this.fetchContributors();
-  }),
+  getContributions() {
+    // this.getTokenMintedEvents().then(events => {
+      let contributions = [];

-  addContribution (attributes) {
-    console.debug('[kredits] add contribution', attributes);
-
-    return this.kredits.Contribution.addContribution(attributes, { gasLimit: 300000 })
-      .then(data => {
-        console.debug('[kredits] add contribution response', data);
-        attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
-        const contribution = Contribution.create(attributes);
-        contribution.set('pendingTx', data);
-        contribution.set('confirmedAtBlock', data.blockNumber + 40320);
-        this.contributions.pushObject(contribution);
-        return contribution;
+      config.fixtures.mintedEvents.forEach(mintedEvent => {
+        contributions.push(this.getContributionData(mintedEvent));
      });
+
+      return Ember.RSVP.all(contributions);
+    // });
  },

-  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`);
-        });
+  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
      });
-  },

-  loadContributionFromData(data) {
-    const contribution = Contribution.create(processContributionData(data));
-    contribution.set('contributor', this.contributors.findBy('id', data.contributorId.toString()));
-    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, 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();
-  }).group('contributionTasks'),
-
-  fetchNewContributions: task(function * () {
-    const count = yield this.kredits.Contribution.functions.contributionsCount();
-    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.functions.contributionsCount();
-    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;
+      if (contribution.get('ipfsHash')) {
+        contribution.loadDetails(this.get('ipfs')).then(
+          () => resolve(contribution),
+          err => reject(err)
+        );
      } 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`);
-        }
+        Ember.Logger.warn('[kredits] contribution from Minted event is missing IPFS hash', contribution);
+        resolve(contribution);
      }
-    }
-    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;
-      });
-  },
-
-  getCurrentUser: computed('kredits.provider', 'currentUserAccounts.[]', function() {
-    if (isEmpty(this.currentUserAccounts)) {
-      return Promise.resolve();
-    }
-    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);
-        }
-      });
-  }),
-
-  // 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.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);
-
-    const oldContributor = this.contributors.findBy('id', contributorId.toString());
-    if (oldContributor) {
-      console.debug('[kredits] old contributor', oldContributor);
-      this.contributors.removeObject(oldContributor);
-    }
-
-    console.debug('[kredits] new contributor', 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.toString() === contributorId.toString()) &&
-             (c.amount.toString() === amount.toString());
    });
-
-    if (pendingContribution) {
-      const attributes = await this.kredits.Contribution.getById(id);
-      attributes.contributor = this.contributors.findBy('id', attributes.contributorId.toString());
-      const newContribution = Contribution.create(attributes);
-      this.contributions.addObject(newContribution);
-      this.contributions.removeObject(pendingContribution);
-    }
  },

-  handleContributionVetoed (contributionId) {
-    console.debug('[kredits] ContributionVetoed event received for ', contributionId);
-    const contribution = this.contributions.findBy('id', contributionId);
-    console.debug('[kredits] contribution', contribution);
+  // logKreditsContract: function() {
+  //   Ember.Logger.debug('[kredits] kreditsContract', this.get('kreditsContract'));
+  // }.on('init')

-    if (contribution) {
-      contribution.set('vetoed', true);
-      contribution.set('pendingTx', null);
-    }
-  },
-
-  handleTransfer (from, to, value) {
-    value = value.toNumber();
-
-    this.contributors
-        .findBy('address', from)
-        .decrementProperty('balance', value);
-
-    this.contributors
-        .findBy('address', to)
-        .incrementProperty('balance', value);
-  },
 });
@@ -1,74 +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);
-  }
-
-  &:active, &.active {
-    border-color: $primary-color;
-  }
-
-  &[disabled] {
-    color: rgba(255,255,255,0.5);
-  }
-
-  &.small {
-    font-size: 0.86rem;
-    padding: 0.2rem 0.8rem;
-  }
-
-  &.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);
-    }
-    &: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);
-    }
-    &:active, &.active {
-      border-color: $green;
-    }
-  }
-
-  &.icon {
-    svg {
-      width: 2rem;
-      height: 2rem;
-      vertical-align: middle;
-      margin-right: 1rem;
-
-      .fg {
-        fill: $primary-color;
-      }
-    }
-  }
-}
@@ -5,6 +5,4 @@ $green: #97fb68;
 $yellow: #fbe468;
 $red: #fb6868;

-$primary-color: $blue;
-
-$body-text-color: #fff;
+$primaryColor: $blue;
@@ -1,154 +1,31 @@
-main {
-  padding: 1rem 2rem;
-
-  @include media-max(small) {
-    padding: 1rem;
-  }
-
-  &#dashboard {
-    width: 100%;
-    display: grid;
-    grid-row-gap: 2rem;
-    grid-template-areas:
-      "stats"
-      "contributions";
-  }
-
-  &.center-column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    section {
-      width: 600px;
-      max-width: 100%;
-
-      header {
-        text-align: center;
-      }
-    }
-  }
-
-  section {
-    .content {
-      a {
-        font-size: inherit;
-      }
-
-      &.text-lg {
-        p {
-          font-size: 1.2rem;
-          margin-bottom: 1em;
-          line-height: 1.5em;
-        }
-      }
-
-      &.text-center {
-        text-align: center;
-      }
-
-      p {
-        &.mg-bottom-md {
-          margin-bottom: 2rem;
-        }
-
-        &.actions {
-          text-align: center;
-          padding-top: 2rem;
-        }
-      }
-    }
-  }
-}
-
-#intro {
-  padding: 2rem;
-  background-color: rgba(0,0,0,.2);
-  font-size: 1.6rem;
-
-  @include media-max(small) {
-    padding: 2rem 1rem;
-    font-size: 1.4rem;
-  }
-
-  h2 {
-    font-size: inherit;
-    margin-bottom: 1em;
-  }
-
-  p {
-    margin-bottom: 1em;
-    line-height: 1.5em;
-    font-size: 1.2rem;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  a {
-    text-decoration: none;
-
-    &:hover, &:active {
-      text-decoration: underline;
-    }
-  }
-}
-
-@media (min-width: 550px) {
-  main {
-    &#dashboard {
-      grid-column-gap: 4rem;
-      grid-row-gap: 2rem;
-      grid-template-columns: 2fr 4fr;
-      grid-template-areas:
-        "stats contributions";
-
-      &.with-details {
-        grid-column-gap: 3rem;
-        grid-template-columns: 2fr 4fr 2fr;
-        grid-template-areas:
-          "stats contributions details";
-      }
-    }
-  }
-}
-
-main section {
-  margin-bottom: 5rem;
-
+section {
+  @include outer-container;
+  margin-bottom: 8rem;
  &:first-of-type {
-    margin-top: 2rem;
+    margin-top: 6rem;
  }

-  @include media-max(small) {
+  @include media($mobile) {
    margin-bottom: 5rem;
+    &:first-of-type {
+      margin-top: 2rem;
+    }
  }

  header {
-    margin-bottom: 3rem;
+    @include span-columns(12);
+    padding-bottom: 3rem;
+    text-align: center;
+    // background-color: purple;

-    &.with-nav {
-      display: grid;
-      grid-template-columns: auto 5rem;
-      grid-template-areas:
-        "title" "actions";
+    @include media($mobile) {
+      @include span-columns(10);
+      @include shift(1);
+      padding-bottom: 2rem;
    }

-    h2 {
-      display: inline-block;
-      // padding-left: 1.2rem;
-    }
-
-    nav {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: flex-end;
-    }
-
-    @include media-max(small) {
-      margin-bottom: 2rem;
+    div.content {
+      @include span-columns(12);
    }
  }
 }
@@ -1,33 +0,0 @@
-$breakpoints-max: (
-  small: 600px,
-  medium: 960px,
-  large: 1280px
-);
-
-$breakpoints-min: (
-  small: 601px,
-  medium: 961px,
-  large: 1281px
-);
-
-@mixin media-max($screen-size) {
-  @if map-has-key($breakpoints-max, $screen-size) {
-    @media (max-width: map-get($breakpoints-max, $screen-size)) {
-      @content;
-    }
-  } @else {
-    // Debugging
-    @warn "'#{$screen-size}' has not been declared as a breakpoint."
-  }
-}
-
-@mixin media-min($screen-size) {
-  @if map-has-key($breakpoints-min, $screen-size) {
-    @media (min-width: map-get($breakpoints-min, $screen-size)) {
-      @content;
-    }
-  } @else {
-    // Debugging
-    @warn "'#{$screen-size}' has not been declared as a breakpoint."
-  }
-}
@@ -1,17 +0,0 @@
-@mixin loading-border-top {
-  &::before {
-    display: block;
-    width: 100%;
-    height: 1px;
-    content: '';
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.2) 40%, #68d7fb 60%, rgba(255, 255, 255, 0.2));
-    background-size: 200% 200%;
-    animation: kitt 2.5s linear infinite;
-  }
-}
-
-@keyframes kitt {
-  0%{ background-position: 0% 0%}
-  50%{ background-position: 100% 0%}
-  100%{ background-position: 0% 0%}
-}
@@ -10,23 +10,23 @@
  -webkit-tap-highlight-color: transparent;
 }

-@import "mediaqueries";
+@import "bourbon";
+@import "settings/neat";
+@import "neat";
+@import "settings/breakpoints";
@import "layout";
@import "colors";

 $font-family-sans: 'Open Sans', sans-serif;

-html, body {
-  font-family: $font-family-sans;
-  font-weight: 300;
-  font-size: 12px;
-  color: $body-text-color;
-}
-
 body {
-  background-image: linear-gradient(to bottom, rgba(22, 21, 40, .4), rgba(0, 0, 0, .75)), url('/img/bg.jpg');
+  background-image: url('/img/bg.jpg');
  background-repeat: none;
  background-attachment: fixed;
+  font-family: $font-family-sans;
+  font-size: 14px;
+  font-weight: 300;
+  color: #fff;
 }

@media screen and (min-width: 900px) {
@@ -41,61 +41,67 @@ h1, h2, h3, h4, h5, input, button {
  font-weight: 300;
 }

-a {
-  color: $primary-color;
-}
-
 section {
  h2 {
-    font-size: 1.4rem;
-    color: $primary-color;
+    font-size: 2.8rem;
+    color: $primaryColor;
+    @include media($mobile) {
+      font-size: 2rem;
+    }
  }

-  &#people {
+  &#contributors {
    .content {
      p.stats {
-        margin-bottom: 1rem;
+        padding-top: 3rem;
        font-size: 1rem;
        color: white;
        text-align: center;
        span.number {
          font-weight: 600;
        }
+        @include media($mobile) {
+          padding-top: 2rem;
+        }
      }
    }
  }

-  &#contributions-by-type {
-    .chart {
-      width: 50%;
-      margin-left: auto;
-      margin-right: auto;
+  &#proposals-open, &#proposals-closed {
+    .actions {
+      padding-top: 3rem;
+      font-size: 1rem;
+      color: $primaryColor;
+      text-align: center;
+      @include media($mobile) {
+        padding-top: 2rem;
+      }

-      @include media-max(small) {
-        width: 75%;
+      a {
+        color: $primaryColor;
      }
    }
  }
 }

-@media (min-width: 550px) {
-  section {
-    h2 {
-      font-size: 2rem;
-    }
+button, input[type=submit] {
+  display: inline-block;
+  border: 1px solid rgba(22, 21, 40, 1);
+  background-color: rgba(22, 21, 40, 0.6);
+  color: $primaryColor;
+  border-radius: 3px;
+  font-weight: 500;
+  text-transform: uppercase;
+  cursor: pointer;
+  letter-spacing: 0.1em;
+
+  &:hover {
+    background-color: rgba(22, 21, 40, 0.8);
  }
 }

-@import "buttons";
-@import "forms";
-@import "sugar";
-
-@import "components/contribution-list";
-@import "components/contribution-details";
-@import "components/contributor-list";
-@import "components/contributor-profile";
-@import "components/external-account-link";
@import "components/loading-spinner";
-@import "components/topbar";
-@import "components/topbar-account-panel";
-@import "components/user-avatar";
+@import "components/contributor-list";
+@import "components/add-contributor";
+@import "components/proposal-list";
+@import "components/contribution-list";
@@ -1,36 +1,20 @@
-section#add-contributor,
-section#add-contribution,
-section#signup {
+section#add-contributor, section#add-proposal {

  form {

    p {
-      margin-bottom: 1.5rem;
-
-      &.mg-bottom-md {
-        margin-bottom: 2rem;
-      }
-
-      &.label {
-        margin-bottom: .5rem;
-      }
+      margin-bottom: 1rem;

      &.actions {
-        padding-top: 1.5rem;
+        padding-top: 1rem;
        text-align: center;
        a {
-          color: $primary-color;
+          color: $primaryColor;
          margin-left: 1rem;
        }
      }
    }

-    label {
-      display: block;
-      margin-bottom: 0.5rem;
-      opacity: 0.7;
-    }
-
    input[type=text], select {
      width: 100%;
      padding: 1rem;
@@ -39,22 +23,17 @@ section#signup {
      background-color: rgba(22, 21, 40, 0.3);
      color: #fff;
      font-size: 1.2rem;
-      transition: border-color 0.1s linear;
-
      &:focus, &.valid {
        background-color: rgba(22, 21, 40, 0.6);
      }
-      &:focus {
-        border-color: $blue;
-      }
-      &::placeholder {
+      @include placeholder {
        color: rgba(238, 238, 238, 0.5);
      }
    }

    select {
-      -moz-appearance: none;
      -webkit-appearance: none;
+      -moz-appearance: none;
      appearance: none;
      border-radius: 0;
      background-color: rgba(22, 21, 40, 0.6);
@@ -1,100 +0,0 @@
-section#contribution-details {
-  header {
-    nav {
-      .amount {
-        font-size: 1.5rem;
-      }
-
-      .symbol {
-        padding-left: 0.2rem;
-      }
-    }
-  }
-
-  .content {
-    width: 100%;
-    margin: 0 0 1.5rem;
-    padding: 2rem 2rem;
-
-    border-top: 1px solid rgba(255,255,255,0.2);
-    border-bottom: 1px solid rgba(255,255,255,0.2);
-    background-color: rgba(255,255,255,0.1);
-
-    h3 {
-      font-size: 1.5rem;
-      margin-bottom: 2rem;
-    }
-
-    p {
-      margin-bottom: 2rem;
-
-      span {
-      }
-
-      &.who-what-when {
-        font-size: 1.2rem;
-        margin-bottom: 1.2rem;
-      }
-
-      &:last-of-type {
-        margin-bottom: 0;
-      }
-    }
-
-    a:not(.button) {
-      color: $primary-color;
-      text-decoration: none;
-
-      &:not(.button):hover {
-        text-decoration: underline;
-      }
-    }
-  }
-
-  .actions {
-    text-align: center;
-  }
-
-  &.vetoed {
-    .content {
-      h3 {
-        text-decoration: line-through;
-      }
-    }
-  }
-
-  .hint.vetoed {
-    overflow: auto;
-    margin-top: 2rem;
-    padding-top: 2rem;
-    border-top: 1px solid rgba(255,255,255,0.2);
-    font-size: 1.2rem;
-
-    .icon {
-      display: inline-block;
-      width: 40px;
-      height: 40px;
-      float: left;
-      margin-right: 1rem;
-      margin-bottom: 1rem;
-
-      svg {
-        width: 100%;
-        height: auto;
-      }
-    }
-  }
-}
-
-// On small screens, hide intro text, contributor and contributions list when
-// showing details
-@include media-max(small) {
-  #dashboard.with-details {
-    #contributions, #stats {
-      display: none;
-    }
-  }
-  #intro.with-details {
-    display: none;
-  }
-}
@@ -1,89 +1,19 @@
-main section {
-  @include media-max(small) {
-    &#contributions-unconfirmed, &#contributions-confirmed {
-      margin-top: 0;
-    }
-  }
-}
-
-.quick-filter {
-  font-size: 1.2rem;
-  margin-bottom: 2rem;
-
-  p {
-    padding: 0.2rem 0 0;
-  }
-
-  label {
-    &+ label {
-      margin-left: 3.6rem;
-    }
-  }
-}
-
 ul.contribution-list {
  clear: both;
  width: 100%;
  list-style: none;

  li {
-    display: grid;
-    grid-template-columns: auto 5rem 5rem;
-    grid-row-gap: 0.5rem;
-    padding: 0.8rem 1.2rem;
+    // display: block;
+    padding: 0 1.2rem;
+    line-height: 4.2rem;
    background-color: rgba(255,255,255,0.1);
-    font-size: 1.2rem;
+    font-size: 1.4rem;
    border-bottom: 1px solid rgba(255,255,255,0.2);
-    cursor: pointer;
-
    &:first-of-type {
      border-top: 1px solid rgba(255,255,255,0.2);
    }

-    &.confirmed {
-      grid-template-columns: auto 5rem;
-    }
-
-    &.vetoed {
-      grid-template-columns: auto 5rem;
-      text-decoration: line-through;
-      opacity: 0.6;
-    }
-
-    &.selected {
-      background-color: rgba(255,255,255,0.2);
-    }
-
-    p {
-      align-self: center;
-      margin: 0;
-      line-height: 2rem;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-
-      &.kredits-amount, &.voting {
-        text-align: right;
-      }
-    }
-
-    span {
-      &.title {
-        a {
-          text-decoration: none;
-          color: $body-text-color;
-        }
-        a:hover, a:active {
-          color: $primary-color;
-        }
-      }
-    }
-
-    .description {
-      line-height: 1.4em;
-      font-size: 1rem;
-    }
-
    .category {
      color: $blue;
      padding-right: 0.2rem;
@@ -93,34 +23,17 @@ ul.contribution-list {
      &.docs      { color: $green; }
      &.ops       { color: $purple; }
    }
-
    .amount {
      font-weight: 500;
    }
-
    .symbol {
-      font-size: 0.8rem;
+      font-size: 1rem;
+      font-weight: 500;
      padding-left: 0.2rem;
    }
-
    .recipient {
      font-weight: 500;
    }
-
-    .votes {
-      font-size: 1rem;
-      color: $primary-color;
-      margin-right: 0.5rem;
-    }
  }

-  &.loading {
-    @include loading-border-top;
-
-    li {
-      &:first-of-type {
-        border-top: none;
-      }
-    }
-  }
 }
@@ -1,59 +1,82 @@
 table.contributor-list {
-  position: relative;
  width: 100%;
  border-collapse: collapse;
-  margin-bottom: 1.5rem;

  tr {
-    background-color: rgba(255,255,255,0.1);
    border-bottom: 1px solid rgba(255,255,255,0.2);
-    cursor: pointer;
-
    &:first-of-type {
      border-top: 1px solid rgba(255,255,255,0.2);
    }
+    background-color: rgba(255,255,255,0.1);

-    &.selected {
+    &.current-user {
      background-color: rgba(255,255,255,0.2);
    }

-    &.current-user {
-      font-weight: 500;
+    &.metadata {
+      height: 0;
+      transition: all 0.2s ease-out;
+
+      td {
+        padding: 0 1.2rem;
+      }
+
+      a {
+        color: $primaryColor;
+        &:hover, &:active {
+          color: #fff;
+        }
+      }
+
+      ul {
+        list-style: none;
+        display: block;
+        overflow: hidden;
+        height: 0;
+        transition: all 0.2s ease-out;
+
+        li {
+          display: inline;
+          &+li {
+            margin-left: 1rem;
+          }
+        }
+      }
+
+      &.visible {
+        height: auto;
+        ul {
+          height: auto;
+        }
+      }
    }

    td {
      padding: 0 1.2rem;
-      line-height: 3.6rem;
+      line-height: 4.2rem;

      &.person {
        text-align: left;
-        font-size: 1.2rem;
-
+        font-size: 1.4rem;
        img.avatar {
+          width: 2rem;
+          height: 2rem;
+          vertical-align: middle;
          margin-right: 0.2rem;
+          border-radius: 1rem;
        }
      }

      &.kredits {
        text-align: right;
-
        .amount {
-          font-size: 1.2rem;
-          font-weight: 500;
+          font-size: 1.4rem;
        }
-
        .symbol {
-          font-size: 0.8rem;
+          font-size: 1rem;
          padding-left: 0.2rem;
        }
      }
    }
  }
-
-  &.loading {
-    @include loading-border-top;
-    &::before {
-      position: absolute;
-    }
-  }
 }
@@ -1,56 +0,0 @@
-section#contributor-profile {
-  text-align: center;
-
-  header {
-    z-index: 2;
-    width: 100%;
-    text-align: center;
-
-    img {
-      margin: 0 auto;
-      border: 3px solid rgba(255,255,255,0.2);
-    }
-  }
-
-  .content {
-    z-index: 1;
-    width: 100%;
-    margin: -7.2rem 0 1.5rem;
-    padding: 6rem 1.2rem 2rem;
-
-    border-top: 1px solid rgba(255,255,255,0.2);
-    border-bottom: 1px solid rgba(255,255,255,0.2);
-    background-color: rgba(255,255,255,0.1);
-
-    h2 {
-      text-align: center;
-      margin-bottom: 0.6rem;
-    }
-
-    p.role {
-      margin-bottom: 2rem;
-    }
-
-    ul.external-accounts {
-      list-style: none;
-
-      li {
-        display: inline-block;
-
-        &+li {
-          margin-left: 0.6rem;
-        }
-      }
-    }
-
-    .actions {
-      margin-top: 2rem;
-    }
-  }
-
-  .actions {
-    .button {
-      margin-bottom: 0.6rem;
-    }
-  }
-}
@@ -1,34 +0,0 @@
-.external-accounts a {
-  display: inline-block;
-  width: 4rem;
-  height: 4rem;
-  padding: 0.8rem;
-  background-color: rgba(0, 0, 0, 0.3);
-  color: $body-text-color;
-  border-radius: 2rem;
-
-  span.site {
-    display: none;
-  }
-
-  svg {
-    display: block;
-    position: relative;
-    width: 100%;
-    height: 100%;
-
-    .fg {
-      fill: $body-text-color;
-    }
-  }
-
-  &:hover, &:active {
-    background-color: rgba(0, 0, 0, 0.5);
-
-    svg {
-      .fg {
-        fill: $primary-color;
-      }
-    }
-  }
-}
@@ -11,9 +11,9 @@
  margin-top: 12rem;
  text-align: center;
  font-size: 1.4rem;
-  color: $primary-color;
+  color: $primaryColor;

-  @include media-max(small) {
+  @include media($mobile) {
    margin-top: 6rem;
  }

@@ -23,7 +23,7 @@
    margin-bottom: 2rem;

    #path-comet {
-      fill: $primary-color;
+      fill: $primaryColor;
      opacity: 0.1;

      animation-name: pulse;
@@ -0,0 +1,52 @@
+ul.proposal-list {
+  clear: both;
+  width: 100%;
+  list-style: none;
+
+  li {
+    // display: block;
+    padding: 0 1.2rem;
+    line-height: 4.2rem;
+    background-color: rgba(255,255,255,0.1);
+    font-size: 1.4rem;
+    border-bottom: 1px solid rgba(255,255,255,0.2);
+    &:first-of-type {
+      border-top: 1px solid rgba(255,255,255,0.2);
+    }
+
+    .category {
+      color: $blue;
+      padding-right: 0.2rem;
+      &.community { color: $red; }
+      &.dev       { color: $pink; }
+      &.design    { color: $yellow; }
+      &.docs      { color: $green; }
+      &.ops       { color: $purple; }
+    }
+    .amount {
+      font-weight: 500;
+    }
+    .symbol {
+      font-size: 1rem;
+      font-weight: 500;
+      padding-left: 0.2rem;
+    }
+    .recipient {
+      font-weight: 500;
+    }
+    .votes {
+      font-size: 1rem;
+      color: $primaryColor;
+      padding-left: 0.5rem;
+    }
+
+    button {
+      float: right;
+      margin-top: 1.1rem;
+      height: 2rem;
+      line-height: 2rem;
+      padding: 0 0.6rem;
+    }
+  }
+
+}
@@ -1,17 +0,0 @@
-header#topbar section#user-account {
-
-  button {
-    margin-left: 1.5rem;
-  }
-
-  button + button {
-    margin-left: 0.6rem;
-  }
-
-  @include media-max(small) {
-    .anonymous {
-      display: none;
-    }
-  }
-
-}
@@ -1,27 +0,0 @@
-#topbar {
-  padding: 0 1rem;
-  height: 3rem;
-  line-height: 3rem;
-  background-color: rgba(0,0,0,.3);
-
-  @include media-min(medium) {
-    padding: 0 2rem;
-    height: 4rem;
-    line-height: 4rem;
-  }
-
-  h1 {
-    display: inline-block;
-    text-transform: uppercase;
-
-    a {
-      color: inherit;
-      text-decoration: none;
-    }
-  }
-
-  section#user-account {
-    display: inline-block;
-    float: right;
-  }
-}
@@ -1,21 +0,0 @@
-img.avatar {
-  width: 2rem;
-  height: 2rem;
-  vertical-align: middle;
-  margin-right: 0.2rem;
-  border-radius: 1rem;
-
-  &.medium {
-    margin: 0;
-    width: 10rem;
-    height: 10rem;
-    border-radius: 5rem;
-  }
-
-  &.large {
-    margin: 0;
-    width: 256px;
-    height: 256px;
-    border-radius: 128px;
-  }
-}
@@ -0,0 +1 @@
+$mobile: new-breakpoint(max-width 600px);
@@ -0,0 +1,5 @@
+// $visual-grid: true;
+// $visual-grid-color: red;
+// $visual-grid-index: front;
+// $visual-grid-opacity: 0.5;
+$max-width: em(500, 12);
@@ -1 +0,0 @@
-<LoadingSpinner />
@@ -1,6 +1,3 @@
-<header id="topbar">
-  <h1><LinkTo @route="dashboard">Kosmos Kredits</LinkTo></h1>
-  <TopbarAccountPanel />
-</header>
-
-{{outlet}}
+<main>
+  {{outlet}}
+</main>
@@ -1,8 +0,0 @@
-<svg class="icon-github" width="260" height="260" enable-background="new 0 0 212.4575 186.23" version="1.1" viewBox="0 0 260 260" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <g transform="translate(23.766 36.885)">
-    <path d="m151.79 86.234c-7.078 0.1229-14.154 0.5605-21.232 0.7069-12.318 0.248-24.64 0.5664-36.961 0.512-11.176-0.0472-22.358-0.9728-33.518-0.7052-7.3164 0.1776-14.373 2.2948-20.131 7.584-9.9472 9.1368-12.522 21-11.314 33.807 1.92 20.357 9.2716 31.449 29.115 37.064 15.793 4.4704 31.963 5.2088 48.199 4.9744 5.254 0 10.51 0.1367 15.758-0.0292 12.723-0.4064 25.264-2.2072 37.358-6.3596 10.846-3.7225 18.799-10.691 22.572-22.166 2.6736-8.1288 3.7148-16.388 2.5544-24.853-1.7772-12.959-13.275-30.86-32.4-30.535zm-81.576 59.996c-8.836 0-16-8.9551-16-20 0-11.045 7.164-20 16-20s16 8.9553 16 20c0 11.045-7.164 20-16 20zm76 0c-8.836 0-16-8.9551-16-20 0-11.045 7.164-20 16-20s16 8.9553 16 20c0 11.045-7.164 20-16 20z" fill="none"/>
-    <path class="fg" d="m200.25 59.188c-2.5076-3.4493-4.3632-6.3888-3.8748-11.44 0.6796-7.0664-0.3536-14.396-1.3204-21.518-1.2188-8.9843-3.5236-17.74-7.1776-26.23-9.0332 1.9356-17.981 3.49-25.963 8.0976-8.4648 4.8908-16.695 10.215-25.08 15.25-0.9532 0.5704-2.3124 0.8848-3.3848 0.7032-17.967-3.1368-35.92-3.0196-53.898-0.086-1.3632 0.2244-3.0724-0.2345-4.2948-0.9608-4.4436-2.6604-8.6564-5.7344-13.123-8.3516-11.656-6.844-23.66-12.822-37.494-14.59-0.3928 0.8597-0.7188 1.4785-0.9612 2.1253-4.164 11.22-6.6424 22.844-7.4276 34.82-0.2872 4.3516-0.6092 8.8048 0 13.072 0.3456 2.4296-4e-3 3.8788-1.3924 5.6132-4.8516 6.0488-8.6368 12.717-11.102 20.219-4.6972 14.295-4.4004 28.861-2.2756 43.475 1.7268 11.974 4.7344 23.537 11.324 33.873 13.186 20.682 32.892 29.774 55.572 31.705 19.308 1.6464 38.8 1.1992 58.213 1.2364 13.855 0.0251 27.57-1.4924 40.715-6.6389 20.375-7.9727 33.859-22.604 40.275-44.166 3.7344-12.545 5.2324-25.396 4.8144-38.498-0.4412-13.81-4.0504-26.566-12.144-37.711zm-18.609 82.435c-3.7736 11.475-11.727 18.444-22.572 22.166-12.094 4.1524-24.635 5.9532-37.358 6.3596-5.248 0.1659-10.504 0.0292-15.758 0.0292-16.236 0.2344-32.406-0.504-48.199-4.9744-19.844-5.6152-27.195-16.707-29.115-37.064-1.2072-12.807 1.3672-24.67 11.314-33.807 5.7576-5.2892 12.814-7.4064 20.131-7.584 11.16-0.2676 22.342 0.658 33.518 0.7052 12.32 0.0544 24.642-0.264 36.961-0.512 7.0784-0.1464 14.154-0.584 21.232-0.7069 19.125-0.3243 30.623 17.576 32.4 30.535 1.1604 8.4647 0.1192 16.724-2.5544 24.853z"/>
-    <ellipse class="fg" cx="70.214" cy="126.23" rx="16" ry="20"/>
-    <ellipse class="fg" cx="146.21" cy="126.23" rx="16" ry="20"/>
-  </g>
-</svg>
@@ -1,8 +0,0 @@
-<svg class="icon-wiki" width="120" height="120" version="1.1" viewBox="0 0 120 120" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <g transform="translate(18.1,3)">
-    <polygon class="fg" transform="translate(-6.2,9)" points="6.2 5 45.7 20.5 45.7 91 6.2 75.5"/>
-    <polygon class="fg" transform="translate(-6.2,9)" points="90 5 50.5 20.5 50.5 91 90 75.5"/>
-    <polygon class="fg" transform="translate(-6.2,9)" points="87 88 87 81.8 60.4 91"/>
-    <polygon class="fg" transform="translate(-6.2,9)" points="9.2 88 9.2 81.8 34.9 91"/>
-  </g>
-</svg>
@@ -1,8 +0,0 @@
-<svg width="256" height="256" version="1.1" viewBox="0 0 67.733 67.733" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <g transform="translate(0 -229.27)">
-    <g transform="matrix(.90278 0 0 .90278 6.5684 141.05)" fill-rule="evenodd">
-      <path class="fg" d="m32.67 117.1c2.2056 0.1405 3.0528 0.27041 4.1992 0.64479 3.9359 1.2854 6.7418 4.6736 7.3059 8.8223 0.06615 0.48578 0.13996 1.0253 0.16431 1.1986 0.29104 2.0743 0.07488 21.552-0.25003 22.55-0.59082 1.814-1.901 2.7993-4.0537 3.0488-1.3671 0.15849-30.564 0.0701-31.846-0.0963-5.2843-0.68659-8.8934-4.001-9.7398-8.9445-0.38418-2.2439-0.62362-20.748-0.29871-23.084 0.34422-2.4746 1.7264-3.797 4.3212-4.1338 0.98769-0.12832 28.191-0.13361 30.197-6e-3"/>
-      <path class="fg" d="m61.114 118.11c0.56621 0.4072 0.97816 1.0565 1.1885 1.874 0.19553 0.75909 0.24474 28.04 0.05371 29.747-0.37333 3.3361-2.6305 4.0137-5.5264 1.6584-7.9722-6.4841-9.021-7.5734-9.6795-10.052-0.26008-0.97895-0.33152-10.629-0.08811-11.876 0.38021-1.9457 1.2594-3.1946 3.7383-5.3099 7.4491-6.3564 7.5914-6.4569 9.0522-6.4008 0.70723 0.0272 0.8599 0.0709 1.2613 0.3593"/>
-    </g>
-  </g>
-</svg>
@@ -1,15 +0,0 @@
-<svg width="60px" height="60px" version="1.1" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <g fill="none" fill-rule="evenodd">
-    <g transform="translate(-479,-238)" stroke="#fbe468" stroke-linecap="round" stroke-linejoin="round" stroke-width="1">
-      <g transform="translate(482,244)">
-        <a transform="translate(0,2)">
-          <polygon id="Triangle-58" points="0.15321 44 27 0 53.847 44"/>
-        </a>
-        <rect x="25" y="13" width="4" height="21"/>
-        <a transform="translate(0,2)">
-          <circle cx="27" cy="38" r="2"/>
-        </a>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
basti	970b390509	Show contribution history from events	2017-08-14 17:33:38 +02:00
basti	b8f4040def	Get contributions from minted events (WIP)	2017-08-14 17:15:11 +02:00
basti	8fbecd928b	Update deps	2017-08-14 17:14:17 +02:00