1.17.0

Merge pull request #191 from 67P/chore/update_dependencies
Update dependencies
2020-06-02 11:55:29 +02:00 · 2020-06-02 11:52:10 +02:00 · 2020-06-02 11:25:35 +02:00 · 2020-06-02 10:55:36 +02:00 · 2020-05-31 12:46:51 +02:00 · 2020-05-31 10:45:16 +02:00
118 changed files with 23486 additions and 14189 deletions
@@ -4,7 +4,6 @@

 root = true

-
 [*]
 end_of_line = lf
 charset = utf-8
@@ -1,8 +1,14 @@
+'use strict';
+
 module.exports = {
  root: true,
+  parser: 'babel-eslint',
  parserOptions: {
    ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
  },
  globals: {
    console: true
@@ -19,7 +25,10 @@ module.exports = {
  },
  rules: {
    'ember/avoid-leaking-state-in-ember-objects': 'warn',
-    'no-console': 'off'
+    'no-console': 'off',
+    'ember/no-jquery': 'error',
+    'ember/require-computed-property-dependencies': 'warn',
+    'ember/no-observers': 'warn'
  },
  overrides: [
    // node files
@@ -35,8 +44,7 @@ module.exports = {
        'server/**/*.js'
      ],
      parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
      },
      env: {
        browser: false,
@@ -1,10 +1,93 @@
 'use strict';

 module.exports = {
-  extends: 'recommended',
+  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"
+			]
+		}
+	]
 };
@@ -14,16 +14,14 @@ notifications:
 addons:
  chrome: stable

-cache:
-  directories:
-    - $HOME/.npm
-
 env:
  global:
    # See https://git.io/vdao3 for details.
    - JOBS=1

+branches:
+  only:
+    - master
+
 script:
-  - npm run lint:hbs
-  - npm run lint:js
  - npm test
@@ -1,14 +1,12 @@
 import Application from '@ember/application';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';

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

 loadInitializers(App, config.modulePrefix);
-
-export default App;
@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { and, notEmpty } from '@ember/object/computed';
-import { isEmpty } from '@ember/utils';
+import { assign } from '@ember/polyfills';
 import moment from 'moment';

 export default Component.extend({
@@ -24,19 +24,17 @@ export default Component.extend({
  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
+    });

-    // Default attributes used by reset
-    if (isEmpty(this.attributes)) {
-      this.set('attributes', {
-        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();
  },
@@ -47,7 +45,9 @@ export default Component.extend({

  actions: {

-    submit () {
+    submit (evt) {
+      evt.preventDefault();
+
      if (!this.isValid) {
        alert('Invalid data. Please review and try again.');
        return;
@@ -1,11 +1,11 @@
-<form {{action "submit" on="submit"}}>
+<form onsubmit={{action "submit"}}>
  <label>
    <p class="label">Contributor:</p>
    <p>
-      <select required onchange={{action (mut contributorId) value="target.value"}}>
+      <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 contributorId contributor.id}}>{{contributor.name}}</option>
+        {{#each @contributors as |contributor|}}
+          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
        {{/each}}
      </select>
    </p>
@@ -13,14 +13,17 @@
  <label>
    <p class="label">Kind:</p>
    <p>
-      <select required onchange={{action (mut kind) value="target.value"}}>
+      <select required onchange={{action (mut this.kind) value="target.value"}}>
        <option value="" selected disabled hidden></option>
-        <option value="community" selected={{eq kind "community"}}>Community</option>
-        <option value="design" selected={{eq kind "design"}}>Design</option>
-        <option value="dev" selected={{eq kind "dev"}}>Development</option>
-        <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
-        <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
-        <option value="special" selected={{eq kind "special"}}>Special</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>
@@ -28,12 +31,12 @@
    <p class="label">Date:</p>
    <p>
      {{ember-flatpickr
-        date=date
-        defaultDate=defaultDate
-        maxDate=defaultDate
+        date=this.date
+        defaultDate=this.defaultDate
+        maxDate=this.defaultDate
        enableTime=true
        time_24hr=true
-        onChange=(action (mut date))
+        onChange=(action (mut this.date))
      }}
    </p>
  </label>
@@ -42,33 +45,33 @@
    <p>
      {{input type="text"
              placeholder="500"
-              value=amount
-              class=(if isValidAmount "valid" "")}}
+              value=this.amount
+              class=(if this.isValidAmount "valid" "")}}
    </p>
  </label>
  <label>
    <p class="label">Description:</p>
    <p>
      {{input type="text"
-              value=description
-              class=(if isValidDescription "valid" "")}}
+              value=this.description
+              class=(if this.isValidDescription "valid" "")}}
    </p>
  </label>
  <label>
    <p class="label">URL (optional):</p>
    <p>
      {{input type="text"
-              value=url
-              class=(if isValidUrl "valid" "")}}
+              value=this.url
+              class=(if this.isValidUrl "valid" "")}}
    </p>
  </label>

-  {{#if details}}
+  {{#if this.details}}
    <label>
      <p class="label">Details:</p>
      <p>
        <pre>
-          {{details}}
+          {{this.details}}
        </pre>
      </p>
    </label>
@@ -76,8 +79,8 @@

  <p class="actions">
    {{input type="submit"
-            disabled=inProgress
-            value=(if inProgress "Processing" "Save")}}
+            disabled=this.inProgress
+            value=(if this.inProgress "Processing" "Save")}}
  </p>
 </form>

@@ -7,6 +7,7 @@ import { isAddress } from 'web3-utils';

 export default Component.extend({

+  router: service(),
  kredits: service(),

  attributes: null,
@@ -21,6 +22,7 @@ export default Component.extend({
  isValidGithubUsername: notEmpty('github_username'),
  isValidGiteaUsername: notEmpty('gitea_username'),
  isValidWikiUsername: notEmpty('wiki_username'),
+  isValidZoomDisplayName: notEmpty('zoom_display_name'),

  isValid: and(
    'isValidAccount',
@@ -47,7 +49,8 @@ export default Component.extend({
      github_username: null,
      github_uid: null,
      gitea_username: null,
-      wiki_username: null
+      wiki_username: null,
+      zoom_display_name: null
    });
  },

@@ -57,9 +60,15 @@ export default Component.extend({

  actions: {

-    submit () {
+    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) {
-        alert('Invalid data. Please review and try again.');
+        window.alert('Invalid data. Please review and try again.');
        return;
      }

@@ -75,6 +84,7 @@ export default Component.extend({
        window.alert('Something went wrong. Please check the browser console.');
      }).finally(() => {
        this.set('inProgress', false);
+        this.router.transitionTo('dashboard');
      });
    }

@@ -1,50 +1,56 @@
-<form {{action "submit" on="submit"}}>
+<form onsubmit={{action "submit"}}>
  <p>
    <label for="c-account">Ethereum account</label>
-    {{input name="account" id="c-account"
-            type="text" value=account
-            placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-            class=(if isValidAccount "valid" "")}}
+      <Input @type="text"
+             @value={{this.account}}
+             name="account" id="c-account"
+             placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
+             class={{if this.isValidAccount "valid" ""}} />
  </p>
  <p>
    <label for="c-kind">Kind</label>
-    <select required onchange={{action (mut kind) value="target.value"}} id="c-kind">
-      <option value="person" selected={{eq kind "person"}}>Person</option>
-      <option value="organization" selected={{eq kind "organization"}}>Organization</option>
+    <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>
    </select>
  </p>
  <p>
    <label for="c-name">Name</label>
-    {{input name="name" type="text" value=name placeholder="Zero Cool"
-            class=(if isValidName "valid" "") id="c-name"}}
+    {{input name="name" type="text" value=this.name placeholder="Zero Cool"
+            class=(if this.isValidName "valid" "") id="c-name"}}
  </p>
  <p>
    <label for="c-url">URL</label>
-    {{input name="url" type="text" value=url placeholder="http://zerocool.bit"
-            class=(if isValidURL "valid" "") id="c-url"}}
+    {{input name="url" type="text" value=this.url placeholder="http://zerocool.bit"
+            class=(if this.isValidURL "valid" "") id="c-url"}}
  </p>
  <p>
    <label for="c-github-uid">GitHub UID</label>
-    {{input name="github_uid" type="text" value=github_uid placeholder="2342"
-            class=(if isValidGithubUID "valid" "") id="c-github-uid"}}
+    {{input name="github_uid" type="text" value=this.github_uid placeholder="2342"
+            class=(if this.isValidGithubUID "valid" "") id="c-github-uid"}}
  </p>
  <p>
    <label for="c-github-username">GitHub username</label>
-    {{input name="github_username" type="text" value=github_username placeholder="zerocool"
-            class=(if isValidGithubUsername "valid" "") id="c-github-username"}}
+    {{input name="github_username" type="text" value=this.github_username placeholder="zerocool"
+            class=(if this.isValidGithubUsername "valid" "") id="c-github-username"}}
  </p>
  <p>
    <label for="c-gitea-username">Gitea username</label>
-    {{input name="gitea_username" type="text" value=gitea_username placeholder="zerocool"
-            class=(if isValidGiteaUsername "valid" "") id="c-gitea-username"}}
+    {{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=wiki_username placeholder="ZeroCool"
-            class=(if isValidWikiUsername "valid" "") id="c-wiki-username"}}
+    {{input name="wiki_username" type="text" value=this.wiki_username placeholder="ZeroCool"
+            class=(if this.isValidWikiUsername "valid" "") id="c-wiki-username"}}
+  </p>
+  <p>
+    <label for="c-zoom-display-name">Zoom display name</label>
+    {{input name="zoom_display_name" type="text" value=this.zoom_display_name placeholder="Zero Cool"
+            class=(if this.isValidZoomDisplayName "valid" "") id="c-zoom-display-name"}}
  </p>
  <p class="actions">
-    {{input type="submit" disabled=inProgress
-            value=(if inProgress "Processing" "Save")}}
+    {{input type="submit" disabled=this.inProgress
+            value=(if this.inProgress "Processing" "Save")}}
  </p>
 </form>
@@ -1,64 +0,0 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-import { and, notEmpty } from '@ember/object/computed';
-
-export default Component.extend({
-
-  attributes: null,
-  contributors: Object.freeze([]),
-
-  isValidContributor: notEmpty('contributorId'),
-  isValidAmount: computed('amount', function() {
-    return parseInt(this.amount, 10) > 0;
-  }),
-  isValidDescription: notEmpty('description'),
-  isValidUrl: notEmpty('url'),
-  isValid: and('isValidContributor',
-               'isValidAmount',
-               'isValidDescription'),
-
-  init () {
-    this._super(...arguments);
-
-    // Default attributes used by reset
-    this.set('attributes', {
-      contributorId: null,
-      kind: 'community',
-      amount: null,
-      description: null,
-      url: null,
-    });
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-    this.reset();
-  },
-
-  reset: function() {
-    this.setProperties(this.attributes);
-  },
-
-  actions: {
-    submit() {
-      if (!this.isValid) {
-        alert('Invalid data. Please review and try again.');
-        return;
-      }
-
-      let attributes = Object.keys(this.attributes);
-      let proposal = this.getProperties(attributes);
-      let saved = this.save(proposal);
-
-      // The promise handles inProgress
-      this.set('inProgress', saved);
-
-      saved.then(() => {
-        this.reset();
-        window.scroll(0,0);
-        window.alert('Proposal added.');
-      });
-    }
-  }
-
-});
@@ -1,44 +0,0 @@
-<form {{action "submit" on="submit"}}>
-  <p>
-    <select required onchange={{action (mut contributorId) value="target.value"}}>
-      <option value="" selected disabled hidden>Contributor</option>
-      {{#each contributors as |contributor|}}
-        <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.github_username}}</option>
-      {{/each}}
-    </select>
-  </p>
-  <p>
-    <select required onchange={{action (mut kind) value="target.value"}}>
-      <option value="community" selected={{eq kind "community"}}>Community</option>
-      <option value="design" selected={{eq kind "design"}}>Design</option>
-      <option value="dev" selected={{eq kind "dev"}}>Development</option>
-      <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
-      <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
-    </select>
-  </p>
-  <p>
-    {{input type="text"
-            placeholder="100"
-            value=amount
-            class=(if isValidAmount "valid" "")}}
-  </p>
-  <p>
-    {{input type="text"
-            placeholder="Description"
-            value=description
-            class=(if isValidDescription "valid" "")}}
-  </p>
-  <p>
-    {{input type="text"
-            placeholder="URL (optional)"
-            value=url
-            class=(if isValidUrl "valid" "")}}
-  </p>
-  <p class="actions">
-    {{input type="submit"
-            disabled=(is-pending inProgress)
-            value=(if (is-pending inProgress) "Processing" "Save")}}
-    {{#link-to "index"}}Back{{/link-to}}
-  </p>
-</form>
-
@@ -1,7 +1,6 @@
 <div class="chart">
-  {{ember-chart type="doughnut"
-                data=chartData
-                options=chartOptions
-                width=200
-                height=200}}
+  <EmberChart @type="doughnut"
+              @data={{this.chartData}}
+              @options={{this.chartOptions}}
+              @width="200" @height="200" />
 </div>
@@ -24,12 +24,10 @@ export default Component.extend({
  contributors: sort('kredits.contributors', 'contributorsSorting'),

  contributorsActive: computed('contributors.[]', 'contributions', function() {
-    let activeIds = this.contributions.mapBy('contributorId')
-                                      .map(id => id.toString())
-                                      .uniq();
-    return this.contributors.filter(c => {
-      return activeIds.includes(c.id.toString());
-    });
+    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() {
@@ -1,41 +1,41 @@
-{{#if showQuickFilter}}
+{{#if @showQuickFilter}}
  <div class="quick-filter">
    <p>
      <label class="filter-contributor">
        Contributor:
-        <select onchange={{action (mut contributorId) value="target.value"}}>
+        <select onchange={{action (mut this.contributorId) value="target.value"}}>
          <option value="" selected>all</option>
-          {{#each contributorsActive as |contributor|}}
-            <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</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 contributionKind) value="target.value"}}>
+        <select onchange={{action (mut this.contributionKind) value="target.value"}}>
          <option value="" selected>all</option>
-          {{#each contributionKinds as |kind|}}
-            <option value={{kind}} selected={{eq contributionKind kind}}>{{capitalize-string kind}}</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=hideSmallContributions}}
+        <Input @type="checkbox" @checked={{this.hideSmallContributions}} />
        Hide small contributions
      </label>
    </p>
  </div>
 {{/if}}

-<ul class="contribution-list">
-  {{#each contributionsFiltered as |contribution|}}
-    <li role="button" {{action "openContributionDetails" contribution}}
-        data-contribution-id={{contribution.id}}
-        class="{{contribution-status contribution}}{{if contribution.vetoed " vetoed"}}{{if (eq contribution.id selectedContributionId) " selected"}}">
+<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">{{user-avatar contributor=contribution.contributor}}</span>
+        <span class="recipient"><UserAvatar @contributor={{contribution.contributor}} /></span>
        <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
        <span class="title">{{contribution.description}}</span>
      </p>
@@ -45,7 +45,9 @@
      {{#unless contribution.vetoed}}
        {{#unless (is-confirmed-contribution contribution)}}
          <p class="voting">
-            <button {{action "veto" contribution.id}} class="small danger">veto</button>
+            {{input type="button" class="button small danger" value="veto"
+                    click=(action "veto" contribution.id)
+                    disabled=contribution.hasPendingChanges}}
          </p>
        {{/unless}}
      {{/unless}}
@@ -2,12 +2,10 @@ import Component from '@ember/component';
 import { inject as service } from '@ember/service';

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

  router: service(),

-  tagName: 'table',
-  classNames: 'contributor-list',
-
  selectedContributorId: null,

  actions: {
@@ -17,5 +15,4 @@ export default Component.extend({
    }

  }
-
 });
@@ -1,20 +1,25 @@
-<tbody>
-  {{#each contributorList as |c|}}
-    <tr role="button" {{action "openContributorDetails" c.contributor}}
-        class="{{if (is-current-user c.contributor) "current-user"}} {{if (eq c.contributor.id selectedContributorId) "selected"}}">
-      <td class="person">
-        {{user-avatar 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 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>
@@ -6,7 +6,7 @@ export default Component.extend({
  account: null,

  iconComponentName: computed('account.site', function() {
-    if (this.account.site.match(/github|gitea|wiki/)) {
+    if (this.account.site.match(/github|gitea|wiki|zoom/)) {
      return 'icon-account-' + this.account.site.replace(/\./g, '-');
    } else {
      return 'icon-web-globe';
@@ -1,4 +1,5 @@
-<a href={{account.url}} target="_blank" rel="noopener" title="{{account.username}} on {{account.site}}">
-  <span class="site">{{account.site}}</span>
-  {{component iconComponentName}}
+<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,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: ""
-});
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: ""
-});
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: ""
-});
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: ""
-});
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: ""
-});
@@ -1,20 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-
-  tagName: 'ul',
-  classNames: ['proposal-list'],
-
-  actions: {
-
-    confirm(proposalId) {
-      if (this.contractInteractionEnabled) {
-        this.confirmProposal(proposalId);
-      } else {
-        window.alert('Only members can vote on proposals. Please ask someone to set you up.');
-      }
-    }
-
-  }
-
-});
@@ -1,20 +0,0 @@
-{{#each proposals as |proposal|}}
-  <li data-proposal-id={{proposal.id}} class={{if proposal.isExecuted "confirmed" "unconfirmed"}}>
-    <p class="meta">
-      <span class="category {{proposal.kind}}">♥ ({{proposal.kind}})</span>
-      <span class="recipient">{{proposal.contributor.name}}:</span>
-    </p>
-    <p class="kredits-amount">
-      <span class="amount">{{proposal.amount}}</span><span class="symbol">₭S</span>
-    </p>
-    <p class="description">
-      <span class="description">{{proposal.description}}</span>
-    </p>
-    <p class="voting">
-      {{#unless proposal.isExecuted}}
-        <span class="votes">({{proposal.votesCount}}/{{proposal.votesNeeded}} votes)</span>
-        <button {{action "confirm" proposal.id}}>+1</button>
-      {{/unless}}
-    </p>
-  </li>
-{{/each}}
@@ -14,7 +14,7 @@ export default Component.extend({

  userHasEthereumWallet: computed(function() {
    return isPresent(window.ethereum);
-  }).volatile(),
+  }),

  showConnectButton: computed('userHasEthereumWallet',
                              'kredits.hasAccounts', function() {
@@ -1,17 +1,17 @@
 <section id="user-account">
-  {{#if setupInProgress}}
+  {{#if this.setupInProgress}}
    Connecting account...
  {{else}}
-    {{#if (and kredits.hasAccounts kredits.currentUser)}}
-      {{kredits.currentUser.name}}
-      {{#if kredits.currentUserIsCore}}
+    {{#if (and this.kredits.hasAccounts this.kredits.currentUser)}}
+      {{this.kredits.currentUser.name}}
+      {{#if this.kredits.currentUserIsCore}}
        <span class="core-flag">(core)</span>
      {{/if}}
    {{else}}
-      Anonymous
-      <button {{action "signup"}} class="small">Sign up</button>
-      {{#if showConnectButton}}
-        <button {{action "connectAccount"}} class="small green">Connect account</button>
+      <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}}
@@ -24,6 +24,9 @@ export default Component.extend({

    if (github_uid) {
      return `https://avatars2.githubusercontent.com/u/${github_uid}?v=3&s=${SIZES[this.size]}`;
+    } else {
+      // TODO use custom avatar
+      return '';
    }
  })

@@ -6,6 +6,8 @@ export default Controller.extend({

  kredits: service(),

+  queryParams: ['contributorId', 'kind', 'amount'],
+
  contributors: alias('kredits.contributors'),
  minedContributors: filterBy('contributors', 'id'),

@@ -8,9 +8,7 @@ export default Controller.extend({
  actions: {

    save (attributes) {
-      return this.kredits
-                 .updateContributor(this.model.id, attributes)
-                 .then(() => this.transitionToRoute('index'))
+      return this.kredits.updateContributor(this.model.id, attributes);
    }

  }
@@ -8,9 +8,7 @@ export default Controller.extend({
  actions: {

    save (contributor) {
-      return this.kredits
-                 .addContributor(contributor)
-                 .then(() => this.transitionToRoute('index'))
+      return this.kredits.addContributor(contributor);
    }

  }
@@ -33,6 +33,10 @@ export default Controller.extend({
  showQuickFilterUnconfirmed: false,
  showQuickFilterConfirmed: false,

+  showIntroText: computed('kredits.{hasAccounts,currentUser}', function(){
+    return (!this.kredits.hasAccounts || !this.kredits.currentUser);
+  }),
+
  actions: {

    vetoContribution (contributionId) {
@@ -41,12 +45,6 @@ export default Controller.extend({
      });
    },

-    confirmProposal (proposalId) {
-      this.kredits.vote(proposalId).then(transaction => {
-        console.debug('[controllers:index] Vote submitted to Ethereum blockhain: '+transaction.hash);
-      });
-    },
-
    toggleQuickFilterUnconfirmed () {
      this.toggleProperty('showQuickFilterUnconfirmed');
    },
@@ -7,6 +7,6 @@ export default Controller.extend({

  ipfsGatewayUrl: computed(function() {
    return config.ipfs.gatewayUrl;
-  }).volatile()
+  })

 });
@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
+import config from 'kredits-web/config/environment';

 export default Controller.extend({

@@ -7,6 +8,10 @@ export default Controller.extend({
    if (this.model.isCore) return 'Core Contributor';
    if (this.model.totalKreditsEarned <= 5000) return 'Newcomer';
    return 'Contributor';
+  }),
+
+  ipfsGatewayUrl: computed(function() {
+    return config.ipfs.gatewayUrl;
  })

 });
@@ -1,24 +0,0 @@
-import Controller from '@ember/controller';
-import { alias, filterBy } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-
-export default Controller.extend({
-  kredits: service(),
-
-  contributors: alias('kredits.contributors'),
-  minedContributors: filterBy('contributors', 'id'),
-
-  actions: {
-    save(proposal) {
-      // contributorIpfsHash is needed for the proposal ipfs data. I'm not happy to do this here but I think to load all the contributors in addProposal again is a bit too much. I hope we can refactor it later.
-      let contributor = this.contributors.findBy('id', proposal.contributorId);
-      proposal.contributorIpfsHash = contributor.get('ipfsHash');
-
-      return this.kredits.addProposal(proposal)
-        .then((proposal) => {
-          this.transitionToRoute('index');
-          return proposal;
-        });
-    }
-  }
-});
@@ -1,6 +1,7 @@
 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({

@@ -8,13 +9,48 @@ export default Helper.extend({
  currentBlock: alias('kredits.currentBlock'),

  compute([contribution]) {
+    this.setupRecompute(contribution);
+
+    let status = [];
+
    if (contribution.vetoed) {
-      return 'vetoed';
+      status.push('vetoed');
    } else if (contribution.confirmedAt > this.currentBlock) {
-      return 'unconfirmed';
+      status.push('unconfirmed');
    } else {
-      return 'confirmed'
+      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,6 +1,5 @@
 import EmberObject, { computed } from '@ember/object';
-import { isEmpty } from '@ember/utils';
-import bignumber from 'kredits-web/utils/cps/bignumber';
+import { isEmpty, isPresent } from '@ember/utils';
 import moment from 'moment';

 export default EmberObject.extend({
@@ -9,11 +8,15 @@ export default EmberObject.extend({
  id: null,
  contributorId: null,
  amount: null,
-  confirmedAt: bignumber('confirmedAtBlock', 'toNumber'),
+  confirmedAt: null,
  vetoed: null,
  ipfsHash: null,

-  creatorAccount: null,
+  // contributor model instance
+  contributor: null,
+
+  // TODO contributor who submitted the contribution
+  // submittedBy: null,

  // IPFS
  kind: null,
@@ -22,7 +25,8 @@ export default EmberObject.extend({
  url: null,
  date: null,
  time: null,
-  ipfsData: '',
+
+  pendingTx: null,

  init () {
    this._super(...arguments);
@@ -35,6 +39,14 @@ export default EmberObject.extend({

  jsDate: computed('iso8601Date', function() {
    return moment(this.iso8601Date).toDate();
-  })
+  }),
+
+  hasPendingChanges: computed('pendingTx', function() {
+    return isPresent(this.pendingTx);
+  }),
+
+  serialize () {
+    return JSON.stringify(this);
+  }

 });
@@ -1,14 +1,12 @@
 import EmberObject from '@ember/object';
-import bignumber from 'kredits-web/utils/cps/bignumber';
-import kreditsValue from 'kredits-web/utils/cps/kredits';

 export default EmberObject.extend({
  // Contract
-  id: bignumber('idRaw', 'toString'),
+  id: null,
  account: null,
-  balance: kreditsValue('balanceRaw'),
-  totalKreditsEarned: bignumber('totalKreditsEarnedRaw', 'toNumber'),
-  contributionsCount: bignumber('contributionsCountRaw', 'toNumber'),
+  balance: 0,
+  totalKreditsEarned: 0,
+  contributionsCount: 0,
  isCore: false,
  ipfsHash: null,

@@ -19,6 +17,10 @@ export default EmberObject.extend({
  github_username: null,
  github_uid: null,
  wiki_username: null,
-  ipfsData: ''
+  zoom_display_name: null,
+
+  serialize () {
+    return JSON.stringify(this);
+  }

 });
@@ -1,32 +0,0 @@
-import EmberObject from '@ember/object';
-import { alias } from '@ember/object/computed';
-import bignumber from 'kredits-web/utils/cps/bignumber';
-
-export default EmberObject.extend({
-
-  // Contract
-  id: bignumber('idRaw', 'toString'),
-  creatorAccount: null,
-  contributorId: bignumber('contributorIdRaw', 'toString'),
-  amount: bignumber('amountRaw', 'toNumber'),
-  votesCount: bignumber('votesCountRaw', 'toNumber'),
-  votesNeeded: bignumber('votesNeededRaw', 'toNumber'),
-  executed: null,
-  ipfsHash: null,
-
-  // Shortcuts
-  isExecuted: alias('executed'),
-
-  // IPFS
-  kind: null,
-  description: null,
-  details: null,
-  url: null,
-  ipfsData: '',
-
-  init () {
-    this._super(...arguments);
-    this.set('details', {});
-  }
-
-});
@@ -1,3 +0,0 @@
-import Resolver from 'ember-resolver';
-
-export default Resolver;
@@ -1,10 +1,10 @@
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';

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

 Router.map(function() {
  this.route('dashboard', function() {
@@ -16,11 +16,8 @@ Router.map(function() {
      this.route('show', { path: ':id' });
    });
  });
-  this.route('proposals', function() {
-    this.route('new');
-  });
  this.route('contributions', function() {
-    this.route('new');
+    this.route('new', { queryParams: ['contributorId', 'kind', 'amount'] });
    this.route('resubmit', { path: ':id/resubmit' });
  });
  this.route('contributors', function() {
@@ -33,5 +30,3 @@ Router.map(function() {
    this.route('complete');
  });
 });
-
-export default Router;
@@ -1,5 +1,6 @@
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
+import { schedule } from '@ember/runloop';

 export default Route.extend({
  kredits: service(),
@@ -21,6 +22,18 @@ export default Route.extend({
    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);
      });
  }
 });
@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+
+  model (params) {
+    return { params };
+  }
+
+});
@@ -22,7 +22,8 @@ export default Route.extend({
      github_username: model.github_username,
      github_uid: model.github_uid,
      gitea_username: model.gitea_username,
-      wiki_username: model.wiki_username
+      wiki_username: model.wiki_username,
+      zoom_display_name: model.zoom_display_name
    });
  }

@@ -0,0 +1,27 @@
+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;
+  }
+}
@@ -1,35 +1,43 @@
 import ethers from 'ethers';
 import Kredits from 'kredits-contracts';
-import RSVP from 'rsvp';

 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 config from 'kredits-web/config/environment';
 import Contributor from 'kredits-web/models/contributor'
-import Proposal from 'kredits-web/models/proposal'
 import Contribution from 'kredits-web/models/contribution'

 export default Service.extend({

+  browserCache: service(),
+
  currentBlock: null,
  currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
  currentUser: null,
  contributors: null,
  contributions: null,
-  proposals: null,
  githubAccessToken: null,

  currentUserIsContributor: notEmpty('currentUser'),
  currentUserIsCore: alias('currentUser.isCore'),
  hasAccounts: notEmpty('currentUserAccounts'),

+  // When data was loaded from cache, we need to fetch updates from the network
+  contributorsNeedSync: false,
+  contributionsNeedSync: false,
+
  contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
    return this.contributions.filter(contribution => {
      return contribution.confirmedAt > this.currentBlock;
@@ -77,7 +85,6 @@ export default Service.extend({
  init () {
    this._super(...arguments);
    this.set('contributors', []);
-    this.set('proposals', []);
    this.set('contributions', []);
  },

@@ -87,7 +94,7 @@ export default Service.extend({
  getEthProvider () {
    let ethProvider;

-    return new RSVP.Promise(async (resolve) => {
+    return new Promise(resolve => {
      function instantiateWithoutAccount () {
        console.debug('[kredits] Creating new instance from npm module class');
        console.debug(`[kredits] providerURL: ${config.web3ProviderUrl}`);
@@ -172,12 +179,24 @@ export default Service.extend({
      .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();
+    }

-  loadInitialData () {
-    return this.getContributors()
-               .then(contributors => this.contributors.pushObjects(contributors))
-               .then(() => this.getContributions())
-               .then(contributions => this.contributions.pushObjects(contributions))
+    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) {
@@ -208,15 +227,48 @@ export default Service.extend({
      });
  },

-  getContributors () {
+  fetchContributors () {
+    console.debug(`[kredits] Fetching all contributors from the network`);
    return this.kredits.Contributor.all()
-      .then((contributors) => {
-        return contributors.map((contributor) => {
-          return Contributor.create(contributor);
+      .then(contributors => {
+        return contributors.forEach(data => {
+          this.loadContributorFromData(data);
+          return;
        });
+      })
+      .then(() => {
+        return this.cacheLoadedContributors();
      });
  },

+  loadContributorFromData(data) {
+    const contributor = Contributor.create(processContributorData(data));
+    const loadedContributor = this.contributors.findBy('id', contributor.id);
+    if (loadedContributor) { this.contributors.removeObject(loadedContributor); }
+    this.contributors.pushObject(contributor);
+    return contributor;
+  },
+
+  async cacheLoadedContributors () {
+    for (const c of this.contributors) {
+      await this.browserCache.contributors.setItem(c.id, 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();
+  }),
+
  addContribution (attributes) {
    console.debug('[kredits] add contribution', attributes);

@@ -225,87 +277,151 @@ export default Service.extend({
        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;
      });
  },

-  //
-  // TODO Implement proposals with voting
-  //
-
-  // addProposal (attributes) {
-  //   console.debug('[kredits] add proposal', attributes);
-  //
-  //   return this.kredits.Proposal.addProposal(attributes)
-  //     .then((data) => {
-  //       console.debug('[kredits] add proposal response', data);
-  //       attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
-  //       return Proposal.create(attributes);
-  //     });
-  // },
-
-  // getProposals () {
-  //   return this.kredits.Proposal.all()
-  //     .then(proposals => {
-  //       return proposals.map(proposal => {
-  //         proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
-  //         return Proposal.create(proposal);
-  //       });
-  //     });
-  // },
-
-  getContributions () {
-    return this.kredits.Contribution.all({page: {size: 200}})
+  fetchContributions (options = { page: { size: 200 } }) {
+    console.debug(`[kredits] Fetching contributions from the network`);
+    return this.kredits.Contribution.all(options)
      .then(contributions => {
-        return contributions.map(contribution => {
-          contribution.contributor = this.contributors.findBy('id', contribution.contributorId.toString());
-          return Contribution.create(contribution);
+        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`);
        });
      });
  },

-  vote (proposalId) {
-    console.debug('[kredits] vote for', proposalId);
-
-    return this.kredits.Proposal.functions.vote(proposalId)
-      .then(data => {
-        console.debug('[kredits] vote response', data);
-        return data;
-      });
+  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;
+      } else {
+        const data = yield this.kredits.Contribution.getById(id);
+        const c = this.loadContributionFromData(data);
+        yield this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+        countFetched++;
+        if (countFetched % 20 === 0) {
+          console.debug(`[kredits] Fetched ${countFetched} more contributions`);
+        }
+      }
+    }
+    console.debug(`[kredits] Cached ${countFetched} past contributions`);
+  }).group('contributionTasks'),
+
+  syncUnconfirmedContributions: task(function * () {
+    if (this.contributionsUnconfirmed.length > 0) {
+      console.debug(`[kredits] Syncing unconfirmed contributions`);
+      for (const c of this.contributionsUnconfirmed) {
+        const data = yield this.kredits.Contribution.getById(c.id);
+        const contribution = this.loadContributionFromData(data);
+        yield this.browserCache.contributions.setItem(c.id.toString(), contribution.serialize());
+      }
+    } else {
+      console.debug(`[kredits] No unconfirmed contributions to sync`);
+    }
+  }),
+
  veto (contributionId) {
    console.debug('[kredits] veto against', contributionId);
+    const contribution = this.contributions.findBy('id', contributionId);

    return this.kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
      .then(data => {
        console.debug('[kredits] veto response', data);
+        contribution.set('pendingTx', data);
        return data;
      });
  },

-  getCurrentUser: computed('kredits.provider', function() {
+  getCurrentUser: computed('kredits.provider', 'currentUserAccounts.[]', function() {
    if (isEmpty(this.currentUserAccounts)) {
-      return RSVP.resolve();
+      return Promise.resolve();
    }
    return this.kredits.Contributor
-      .functions.getContributorIdByAddress(this.get('currentUserAccounts.firstObject'))
+      .functions.getContributorIdByAddress(this.currentUserAccounts.firstObject)
      .then((id) => {
        // check if the user is a contributor or not
        if (id === 0) {
-          return RSVP.resolve();
+          return Promise.resolve();
        } else {
          return this.kredits.Contributor.getById(id);
        }
      });
  }),

-  findProposalById(proposalId) {
-    return this.proposals.findBy('id', proposalId.toString());
-  },
-
  // Contract events
  addContractEventHandlers () {
    this.kredits.Contributor
@@ -317,11 +433,6 @@ export default Service.extend({
      .on('ContributionAdded', this.handleContributionAdded.bind(this))
      .on('ContributionVetoed', this.handleContributionVetoed.bind(this))

-    this.kredits.Proposal
-      .on('ProposalCreated', this.handleProposalCreated.bind(this))
-      .on('ProposalVoted', this.handleProposalVoted.bind(this))
-      .on('ProposalExecuted', this.handleProposalExecuted.bind(this));
-
    this.kredits.Token
      .on('Transfer', this.handleTransfer.bind(this));
  },
@@ -367,48 +478,10 @@ export default Service.extend({

    if (contribution) {
      contribution.set('vetoed', true);
+      contribution.set('pendingTx', null);
    }
  },

-  handleProposalCreated (proposalId) {
-    let proposal = this.findProposalById(proposalId);
-
-    if (proposal) {
-      console.debug('[events] proposal exists, not adding from event');
-      return;
-    }
-
-    this.kredits.Proposal.getById(proposalId)
-      .then((proposal) => {
-        proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
-        this.proposals.pushObject(Proposal.create(proposal));
-      });
-  },
-
-  // TODO: We may want to reload that proposal to show the voter as voted
-  handleProposalVoted (proposalId, voterId, totalVotes) {
-    let proposal = this.findProposalById(proposalId);
-
-    if (proposal) {
-      proposal.set('votesCount', totalVotes);
-    }
-  },
-
-  handleProposalExecuted (proposalId, contributorId, amount) {
-    let proposal = this.findProposalById(proposalId);
-
-    if (proposal.get('isExecuted')) {
-      console.debug('[events] proposal already executed, not adding from event');
-      return;
-    }
-
-    proposal.set('executed', true);
-
-    this.contributors
-        .findBy('id', contributorId.toString())
-        .incrementProperty('balance', amount);
-  },
-
  handleTransfer (from, to, value) {
    value = value.toNumber();

@@ -10,6 +10,7 @@ button, input[type=submit], .button {
  text-transform: uppercase;
  cursor: pointer;
  letter-spacing: 0.1em;
+  -webkit-appearance: none;

  &+button, &+input[type=submit], &+.button {
    margin-left: 0.5rem;
@@ -32,7 +33,7 @@ button, input[type=submit], .button {
    padding: 0.2rem 0.8rem;
  }

-  &.danger {
+  &.danger:not(:disabled) {
    color: $red;
    background-color: rgba(40, 21, 21, 0.6);
    border-color: rgba(40, 21, 21, 1);
@@ -45,7 +46,7 @@ button, input[type=submit], .button {
    }
  }

-  &.green {
+  &.green:not(:disabled) {
    color: $green;
    background-color: rgba(21, 40, 21, 0.6);
    border-color: rgba(21, 40, 21, 1);
@@ -8,8 +8,3 @@ $red: #fb6868;
 $primary-color: $blue;

 $body-text-color: #fff;
-
-#topbar {
-  background-color: rgba(255, 0, 255, .2);
-}
-
@@ -1,6 +1,5 @@
 section#add-contributor,
 section#add-contribution,
-section#add-proposal,
 section#signup {

  form {
@@ -61,6 +61,40 @@ main {
  }
 }

+#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 {
@@ -0,0 +1,17 @@
+@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%}
+}
@@ -76,22 +76,6 @@ section {
      }
    }
  }
-
-  &#proposals-open, &#proposals-closed {
-    .actions {
-      padding-top: 3rem;
-      font-size: 1rem;
-      color: $primary-color;
-      text-align: center;
-      @include media-max(small) {
-        padding-top: 2rem;
-      }
-
-      a {
-        color: $primary-color;
-      }
-    }
-  }
 }

@media (min-width: 550px) {
@@ -104,6 +88,7 @@ section {

@import "buttons";
@import "forms";
+@import "sugar";

@import "components/contribution-list";
@import "components/contribution-details";
@@ -111,7 +96,6 @@ section {
@import "components/contributor-profile";
@import "components/external-account-link";
@import "components/loading-spinner";
-@import "components/proposal-list";
@import "components/topbar";
@import "components/topbar-account-panel";
@import "components/user-avatar";
@@ -84,5 +84,17 @@ section#contribution-details {
      }
    }
  }
-
+}
+
+// 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;
+  }
 }
@@ -114,37 +114,12 @@ ul.contribution-list {
    }
  }

-}
+  &.loading {
+    @include loading-border-top;

-@media (min-width: 550px) {
-  ul.proposal-list {
    li {
-      grid-template-columns: auto 10rem;
-      grid-row-gap: 0.5rem;
-
-      p {
-        &.kredits-amount, &.voting {
-          text-align: right;
-        }
-      }
-
-      &.unconfirmed {
-        p {
-          &.kredits-amount, &.voting {
-            text-align: right;
-          }
-
-          &.description {
-            grid-column-start: span 1;
-          }
-
-          &.voting {
-            grid-column-start: span 1;
-          }
-        }
-      }
-
-      .description {
+      &:first-of-type {
+        border-top: none;
      }
    }
  }
@@ -1,4 +1,5 @@
 table.contributor-list {
+  position: relative;
  width: 100%;
  border-collapse: collapse;
  margin-bottom: 1.5rem;
@@ -48,4 +49,11 @@ table.contributor-list {
      }
    }
  }
+
+  &.loading {
+    @include loading-border-top;
+    &::before {
+      position: absolute;
+    }
+  }
 }
@@ -42,6 +42,10 @@ section#contributor-profile {
        }
      }
    }
+
+    .actions {
+      margin-top: 2rem;
+    }
  }

  .actions {
@@ -1,111 +0,0 @@
-ul.proposal-list {
-  clear: both;
-  width: 100%;
-  list-style: none;
-
-  li {
-    display: grid;
-    grid-template-columns: auto 5rem;
-    grid-row-gap: 0.5rem;
-    padding: 1rem 1.2rem;
-    background-color: rgba(255,255,255,0.1);
-    font-size: 1.2rem;
-    border-bottom: 1px solid rgba(255,255,255,0.2);
-
-    &:first-of-type {
-      border-top: 1px solid rgba(255,255,255,0.2);
-    }
-
-    p {
-      align-self: center;
-      margin: 0;
-      line-height: 2rem;
-
-      &.kredits-amount, &.voting {
-        text-align: right;
-      }
-
-      &.description {
-        grid-column-start: span 2;
-      }
-
-      &.voting {
-        grid-column-start: span 2;
-      }
-    }
-
-    span {
-    }
-
-    .description {
-      line-height: 1.4em;
-      font-size: 1rem;
-    }
-
-    .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: $primary-color;
-      margin-right: 0.5rem;
-    }
-  }
-
-}
-
-@media (min-width: 550px) {
-  ul.proposal-list {
-    li {
-      grid-template-columns: auto 10rem;
-      grid-row-gap: 0.5rem;
-
-      p {
-        &.kredits-amount, &.voting {
-          text-align: right;
-        }
-      }
-
-      &.unconfirmed {
-        p {
-          &.kredits-amount, &.voting {
-            text-align: right;
-          }
-
-          &.description {
-            grid-column-start: span 1;
-          }
-
-          &.voting {
-            grid-column-start: span 1;
-          }
-        }
-      }
-
-
-      .description {
-      }
-    }
-  }
-}
@@ -8,4 +8,10 @@ header#topbar section#user-account {
    margin-left: 0.6rem;
  }

+  @include media-max(small) {
+    .anonymous {
+      display: none;
+    }
+  }
+
 }
@@ -1 +1 @@
-{{loading-spinner}}
+<LoadingSpinner />
@@ -1,6 +1,6 @@
 <header id="topbar">
-  <h1>{{link-to "Kosmos Kredits" "dashboard"}}</h1>
-  {{topbar-account-panel}}
+  <h1><LinkTo @route="dashboard">Kosmos Kredits</LinkTo></h1>
+  <TopbarAccountPanel />
 </header>

 {{outlet}}
@@ -1,4 +1,4 @@
-<svg id="svg825" 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#">
+<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"/>
@@ -0,0 +1,8 @@
+<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>
@@ -6,7 +6,9 @@
    </header>

    <div class="content">
-      {{add-contribution contributors=sortedContributors save=(action "save")}}
+      <AddContribution @contributors={{this.sortedContributors}}
+                       @attributes={{this.model.params}}
+                       @save={{action "save"}} />
    </div>
  </section>

@@ -2,11 +2,13 @@

  <section id="add-contribution">
    <header>
-      <h2>Re-submit contribution #{{model.id}}</h2>
+      <h2>Re-submit contribution #{{this.model.id}}</h2>
    </header>

    <div class="content">
-      {{add-contribution attributes=attributes contributors=sortedContributors save=(action "save")}}
+      <AddContribution @attributes={{this.attributes}}
+                       @contributors={{this.sortedContributors}}
+                       @save={{action "save"}} />
    </div>
  </section>

@@ -6,7 +6,7 @@
    </header>

    <div class="content">
-      {{add-contributor attributes=attributes save=(action "save")}}
+      <AddContributor @attributes={{this.attributes}} @save={{action "save"}} />
    </div>
  </section>

@@ -6,7 +6,7 @@
    </header>

    <div class="content">
-      {{add-contributor save=(action "save")}}
+      <AddContributor @save={{action "save"}} />
    </div>
  </section>

@@ -1,26 +1,45 @@
-<main id="dashboard" class={{if showDetailsPane "with-details"}}>
+{{#if this.showIntroText}}
+  <div id="intro" class={{if this.showDetailsPane "with-details"}}>
+    <h2>
+      Welcome to the contribution dashboard of the
+      <a href="https://kosmos.org" target="_blank" rel="noreferrer noopener">Kosmos</a> project!
+    </h2>
+    <p>
+      If you want to learn more about what the numbers mean and how this works,
+      check out the
+      <a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noreferrer noopener">Kredits documentation</a>.
+      If you want to start earning kredits for your contributions,
+      <LinkTo @route="signup">create a contributor profile</LinkTo>.
+    </p>
+  </div>
+{{/if}}
+
+<main id="dashboard" class={{if this.showDetailsPane "with-details"}}>

  <div id="stats">
    <section id="people">
      <header class="with-nav">
        <h2>Contributors</h2>
-        {{#if kredits.hasAccounts}}
+        {{#if this.kredits.hasAccounts}}
          <nav>
-            {{link-to "add" "contributors.new" title="Add contributor profile" class="button small green"}}
+            <LinkTo @route="contributors.new" @title="Add contributor profile" class="button small green">add</LinkTo>
          </nav>
        {{/if}}
      </header>
      <div class="content">
-        {{contributor-list contributorList=kreditsToplist
-                           showUnconfirmedKredits=showUnconfirmedKredits
-                           selectedContributorId=selectedContributorId}}
+        <ContributorList @contributorList={{this.kreditsToplist}}
+                         @showUnconfirmedKredits={{this.showUnconfirmedKredits}}
+                         @selectedContributorId={{this.selectedContributorId}}
+                         @loading={{this.kredits.syncContributors.isRunning}} />

        <p class="stats">
-          <span class="number">{{await kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
-          <span class="number">{{contributorsWithKredits.length}}</span> contributors
+          <span class="number">{{await this.kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
+          <span class="number">{{this.contributorsWithKredits.length}}</span> contributors
        </p>
        <p class="stats">
-          {{input type="checkbox" id="hide-unnconfirmed-kredits" checked=showUnconfirmedKredits}}
+          <Input id="hide-unnconfirmed-kredits"
+                 @type="checkbox"
+                 @checked={{this.showUnconfirmedKredits}} />
          <label for="hide-unnconfirmed-kredits">Show unconfirmed kredits in toplist</label>
        </p>
      </div>
@@ -31,30 +50,39 @@
        <h2>Contributions by type</h2>
      </header>
      <div class="content">
-        {{chart-contributions-by-type contributions=contributions}}
+        <ChartContributionsByType @contributions={{this.contributions}} />
      </div>
    </section>
  </div>

  <div id="contributions">
-    {{#if contributionsUnconfirmed}}
+    {{#if this.contributionsUnconfirmed}}
      <section id="contributions-unconfirmed">
        <header class="with-nav">
-          <h2>Latest Contributions</h2>
-          {{#if kredits.hasAccounts}}
-            <nav>
-              <button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
-              {{link-to "add" "contributions.new" title="Submit a contribution" class="button small green"}}
-            </nav>
-          {{/if}}
+          <h2>
+            Latest Contributions
+          </h2>
+          <nav>
+            <button type="button"
+                    onclick={{action "toggleQuickFilterUnconfirmed"}}
+                    class="small {{if this.showQuickFilterUnconfirmed "active"}}">
+              filter
+            </button>
+            {{#if this.kredits.hasAccounts}}
+              <LinkTo @route="contributions.new"
+                      @title="Submit a contribution"
+                      class="button small green">add</LinkTo>
+            {{/if}}
+          </nav>
        </header>
        <div class="content">
          {{!-- TODO: We need a better naming for kredits.hasAccounts --}}
-          {{contribution-list contributions=contributionsUnconfirmedSorted
-                              vetoContribution=(action "vetoContribution")
-                              contractInteractionEnabled=kredits.hasAccounts
-                              selectedContributionId=selectedContributionId
-                              showQuickFilter=showQuickFilterUnconfirmed}}
+          <ContributionList @contributions={{this.contributionsUnconfirmedSorted}}
+                            @vetoContribution={{action "vetoContribution"}}
+                            @contractInteractionEnabled={{this.kredits.hasAccounts}}
+                            @selectedContributionId={{this.selectedContributionId}}
+                            @showQuickFilter={{this.showQuickFilterUnconfirmed}}
+                            @loading={{this.kredits.syncContributions.isRunning}}/>
        </div>
      </section>
    {{/if}}
@@ -63,14 +91,18 @@
      <header class="with-nav">
        <h2>Confirmed Contributions</h2>
        <nav>
-          <button {{action "toggleQuickFilterConfirmed"}} class="small {{if showQuickFilterConfirmed "active"}}">filter</button>
+          <button type="button"
+                  onclick={{action "toggleQuickFilterConfirmed"}}
+                  class="small {{if this.showQuickFilterConfirmed "active"}}">
+            filter
+          </button>
        </nav>
      </header>
      <div class="content">
-        {{contribution-list contributions=contributionsConfirmedSorted
-                            vetoContribution=(action "vetoContribution")
-                            selectedContributionId=selectedContributionId
-                            showQuickFilter=showQuickFilterConfirmed}}
+        <ContributionList @contributions={{this.contributionsConfirmedSorted}}
+                          @vetoContribution={{action "vetoContribution"}}
+                          @selectedContributionId={{this.selectedContributionId}}
+                          @showQuickFilter={{this.showQuickFilterConfirmed}} />
      </div>
    </section>
  </div>
@@ -1,8 +1,8 @@
-<section id="contribution-details" class={{if model.vetoed "vetoed"}}>
+<section id="contribution-details" class={{if this.model.vetoed "vetoed"}}>
  <header class="with-nav">
-    <h2>Contribution #{{model.id}}</h2>
+    <h2>Contribution #{{this.model.id}}</h2>
    <nav>
-      <span class="amount">{{model.amount}}</span>&nbsp;
+      <span class="amount">{{this.model.amount}}</span>&nbsp;
      <span class="symbol">₭S</span>
    </nav>
  </header>
@@ -10,39 +10,39 @@
  <div class="content">
    <p class="who-what-when">
      <span class="contributor">
-        {{user-avatar contributor=model.contributor}}
-        {{link-to model.contributor.name "dashboard.contributors.show" model.contributor}}
+        <UserAvatar @contributor={{this.model.contributor}} />
+        <LinkTo @route="dashboard.contributors.show" @model={{this.model.contributor}}>{{this.model.contributor.name}}</LinkTo>
      </span>
      contributed
-      <span class="date" title={{model.iso8601Date}}>{{moment-from model.iso8601Date}}</span>:
+      <span class="date" title={{this.model.iso8601Date}}>{{moment-from this.model.iso8601Date}}</span>:
    </p>
-    <h3>{{model.description}}</h3>
+    <h3>{{this.model.description}}</h3>
    <p>
-      Kind: {{model.kind}}
-      <br>Status: {{contribution-status model}}
+      Kind: {{this.model.kind}}
+      <br>Status: {{contribution-status this.model}}
    </p>
-    {{#if model.url}}
+    {{#if this.model.url}}
      <p>
-        <a href={{model.url}}
-           title={{model.description}}
+        <a href={{this.model.url}}
+           title={{this.model.description}}
           class="button"
           target="_blank"
-           rel="noopener">
+           rel="noopener noreferrer">
          Open URL
        </a>
      </p>
    {{/if}}
-    {{#if model.vetoed}}
+    {{#if this.model.vetoed}}
      <div class="hint vetoed">
        <div class="icon">
-          {{icon-warning}}
+          <IconWarning />
        </div>
        <p>
          This contribution has been vetoed, meaning no
          kredits will be issued.
        </p>
        <p>
-          {{link-to "Re-submit contribution …" "contributions.resubmit" model class="button small green"}}.
+          <LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small green">Re-submit contribution …</LinkTo>
        </p>
      </div>
    {{/if}}
@@ -50,9 +50,10 @@

  <div class="actions">
    <p>
-      {{#if model.ipfsHash}}
-        <a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}"
-           class="button small" target="_blank" rel="noopener">
+      <LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small">Copy & edit as new</LinkTo>
+      {{#if this.model.ipfsHash}}
+        <a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}"
+           class="button small" target="_blank" rel="noopener noreferrer">
          Inspect IPFS data
        </a>
      {{/if}}
@@ -1,36 +1,41 @@
 <section id="contributor-profile">
  <header>
-    {{user-avatar contributor=model size="medium"}}
+    <UserAvatar @contributor={{this.model}} @size="medium" />
  </header>

  <div class="content">
-    <h2>{{model.name}}</h2>
-    <p class="role">{{roleName}}</p>
+    <h2>{{this.model.name}}</h2>
+    <p class="role">{{this.roleName}}</p>

    <ul class="external-accounts">
-      {{#each model.accounts as |account|}}
+      {{#each this.model.accounts as |account|}}
        <li>
-          {{external-account-link account=account}}
+          <ExternalAccountLink @account={{account}} />
        </li>
      {{/each}}
-      {{#if model.url}}
+      {{#if this.model.url}}
        <li>
-          <a href={{model.url}} target="_blank" rel="noopener" title="Website">
+          <a href={{this.model.url}} target="_blank" rel="noopener noreferrer" title="Website">
            <span class="site">Web</span>
-            {{icon-web-globe}}
+            <IconWebGlobe />
          </a>
        </li>
      {{/if}}
    </ul>
+    <div class="actions">
+      <p>
+        <LinkTo @route="contributions.new" @query={{hash contributorId=this.model.id}} class="button green">♥ Give kredits</LinkTo>
+      </p>
+    </div>
  </div>

  <div class="actions">
    <p>
-      <a href="https://rinkeby.etherscan.io/address/{{model.account}}" class="button small" target="_blank" rel="noopener">Inspect Ethereum transactions</a>
-      {{#if model.ipfsHash}}
-        <a href="https://ipfs.io/ipfs/{{model.ipfsHash}}" class="button small" target="_blank" rel="noopener">Inspect IPFS profile</a>
+      <a href="https://rinkeby.etherscan.io/address/{{this.model.account}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect Ethereum transactions</a>
+      {{#if this.model.ipfsHash}}
+        <a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect IPFS profile</a>
      {{/if}}
-      {{link-to "Edit profile" "contributors.edit" model class="button small"}}
+      <LinkTo @route="contributors.edit" @model={{this.model}} class="button small">Edit profile</LinkTo>
    </p>
  </div>
 </section>
@@ -1,10 +0,0 @@
-<section id="add-proposal">
-  <header>
-    <h2>Add Proposal</h2>
-  </header>
-
-  <div class="content">
-    {{add-proposal contributors=minedContributors save=(action "save")}}
-  </div>
-</section>
-
@@ -10,6 +10,6 @@
    <a href="https://wiki.kosmos.org/Main_Page#Community_.2F_Getting_in_touch_.2F_Getting_involved">in one of our chat rooms</a>?.
  </p>
  <p class="actions">
-    {{#link-to "dashboard" class="button small"}}Return to dashboard{{/link-to}}
+    <LinkTo @route="dashboard" class="button small">Return to dashboard</LinkTo>
  </p>
 </div>
@@ -6,19 +6,18 @@
    Kredits allow you to take part in project governance, and to earn rewards for
    your contributions. For both, you will need an Ethereum wallet/account.
  </p>
-  <form {{action "submit" on="submit"}}>
+  <form>
    <p>
      <label>
        Ethereum account:<br>
-        {{input type="text" value=ethAddress
-                placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-                class=(if isValidEthAccount "valid" "")}}
+        <Input @type="text" @value={{this.ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if this.isValidEthAccount "valid" ""}} />
      </label>
    </p>
  </form>
  <p class="actions">
-    <button disabled={{signupButtonDisabled}}
-            {{action "completeSignup"}}>
+    <button disabled={{this.signupButtonDisabled}}
+            onclick={{action "completeSignup"}}
+            type="button">
      Complete my profile
    </button>
  </p>
@@ -12,8 +12,8 @@
    connecting one of the following accounts:
  </p>
  <p class="actions">
-    <button {{action "connectGithub"}} class="icon">
-      {{icon-account-github-com}}
+    <button onclick={{action "connectGithub"}} class="icon" type="button">
+      <IconAccountGithubCom />
      Connect GitHub
    </button>
  </p>
@@ -1,20 +0,0 @@
-import { computed } from '@ember/object';
-import ethers from 'ethers';
-
-export default function(dependentKey, converterMethod) {
-  return computed(dependentKey, {
-    get () {
-      let value = this.get(dependentKey);
-      if (value && ethers.utils.BigNumber.isBigNumber(value)) {
-        return value[converterMethod]();
-      } else {
-        return value;
-      }
-    },
-    set (key, value) {
-      const bnValue = ethers.utils.bigNumberify(value);
-      this.set(dependentKey, bnValue);
-      return bnValue[converterMethod]();
-    }
-  });
-}
@@ -1,17 +0,0 @@
-import { computed } from '@ember/object';
-import ethers from 'ethers';
-import formatKredits from 'kredits-web/utils/format-kredits';
-
-export default function(dependentKey, options = {}) {
-  return computed(dependentKey, {
-    get () {
-      const value = this.get(dependentKey);
-      return formatKredits(value, options);
-    },
-    set (key, value) {
-      const bnValue = ethers.utils.bigNumberify(value);
-      this.set(dependentKey, bnValue);
-      return formatKredits(bnValue, options);
-    }
-  });
-}
@@ -0,0 +1,21 @@
+export default function processContributionData(data) {
+  const processed = {}
+
+  if (data.confirmedAtBlock && (typeof data.confirmedAtBlock.toNumber === 'function')) {
+    processed.confirmedAt = data.confirmedAtBlock.toNumber();
+  } else if (data.confirmedAt !== 'undefined') {
+    processed.confirmedAt = data.confirmedAt;
+  }
+
+  const otherProperties = [
+    'id', 'contributorId', 'amount', 'vetoed',
+    'ipfsHash', 'kind', 'description', 'details',
+    'url', 'date', 'time', 'pendingTx'
+  ];
+
+  otherProperties.forEach(prop => {
+    processed[prop] = data[prop];
+  });
+
+  return processed;
+}
@@ -0,0 +1,19 @@
+export default function processContributorData(data) {
+  const processed = {
+    id: data.id.toString(),
+    balance: data.balanceInt,
+    totalKreditsEarned: data.totalKreditsEarned,
+    contributionsCount: data.contributionsCount?.toNumber()
+  }
+
+  const otherProperties = [
+    'account', 'accounts', 'ipfsHash', 'isCore', 'kind', 'name', 'url',
+    'github_username', 'github_uid', 'wiki_username', 'zoom_display_name'
+  ];
+
+  otherProperties.forEach(prop => {
+    processed[prop] = data[prop];
+  });
+
+  return processed;
+}
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.18.0",
+      "blueprints": [
+        {
+          "name": "app",
+          "outputRepo": "https://github.com/ember-cli/ember-new-output",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
@@ -1,3 +1,6 @@
 {
-  "jquery-integration": true
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": false,
+  "template-only-glimmer-components": true
 }
@@ -1,6 +1,6 @@
 {
  "name": "kredits-web",
-  "version": "1.10.0",
+  "version": "1.17.0",
  "private": true,
  "description": "Contribution dashboard of the Kosmos project",
  "repository": "https://github.com/67P/kredits-web",
@@ -11,12 +11,14 @@
    "test": "tests"
  },
  "scripts": {
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
    "lint:hbs": "ember-template-lint .",
    "lint:js": "eslint .",
-    "test": "ember test",
    "start": "ember serve",
+    "test": "npm-run-all lint:* test:*",
+    "test:ember": "ember test",
    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember serve",
-    "build": "ember build",
+    "build": "ember build --environment=production",
    "build-prod": "rm -rf release/* && ember build -prod --output-path release",
    "preversion": "npm test",
    "version": "npm run build-prod && git add release/",
@@ -24,53 +26,61 @@
    "deploy": "git push 5apps master"
  },
  "devDependencies": {
-    "@ember/jquery": "^0.6.0",
-    "@ember/optional-features": "^0.7.0",
+    "@ember/optional-features": "^1.3.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
+    "@kosmos/schemas": "^2.2.1",
+    "babel-eslint": "^10.1.0",
    "babel-preset-es2015": "^6.22.0",
    "babelify": "^7.3.0",
    "brfs": "^2.0.2",
    "broccoli-asset-rev": "^3.0.0",
-    "ember-ajax": "^5.0.0",
-    "ember-auto-import": "^1.5.2",
+    "ember-auto-import": "^1.5.3",
    "ember-awesome-macros": "0.41.0",
-    "ember-cli": "~3.10.1",
+    "ember-cli": "~3.18.0",
    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.7.3",
-    "ember-cli-chart": "^3.4.0",
-    "ember-cli-dependency-checker": "^3.1.0",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
-    "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-moment-shim": "^3.7.1",
-    "ember-cli-sass": "^7.2.0",
+    "ember-cli-babel": "^7.20.4",
+    "ember-cli-chart": "^3.6.0",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-htmlbars": "^5.1.2",
+    "ember-cli-inject-live-reload": "^2.0.2",
+    "ember-cli-moment-shim": "^3.8.0",
+    "ember-cli-sass": "^10.0.1",
    "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-uglify": "^2.1.0",
-    "ember-export-application-global": "^2.0.0",
-    "ember-flatpickr": "^2.14.0",
-    "ember-load-initializers": "^2.0.0",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-concurrency": "^1.1.7",
+    "ember-export-application-global": "^2.0.1",
+    "ember-fetch": "^8.0.1",
+    "ember-flatpickr": "^2.16.2",
+    "ember-load-initializers": "^2.1.1",
    "ember-macro-helpers": "0.17.0",
    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-moment": "^7.8.1",
-    "ember-promise-helpers": "1.0.6",
-    "ember-qunit": "^4.4.1",
-    "ember-resolver": "^5.0.1",
-    "ember-source": "~3.10.0",
+    "ember-moment": "^8.0.0",
+    "ember-promise-helpers": "^1.0.9",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^8.0.0",
+    "ember-source": "~3.18.0",
+    "ember-template-lint": "^2.8.0",
    "ember-truth-helpers": "github:jmurphyau/ember-truth-helpers#31a14373a31f1f82c77537720549b47a95c28e5f",
-    "eslint-plugin-ember": "^6.2.0",
-    "eslint-plugin-node": "^9.0.1",
-    "ethers": "^4.0.27",
-    "kosmos-schemas": "^2.0.0",
-    "kredits-contracts": "^5.4.0",
+    "eslint": "^7.1.0",
+    "eslint-plugin-ember": "^8.5.2",
+    "eslint-plugin-node": "^11.1.0",
+    "ethers": "^4.0.47",
+    "kredits-contracts": "^5.5.0",
    "loader.js": "^4.7.0",
+    "localforage": "^1.7.3",
    "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3",
-    "qunit-dom": "^0.8.4",
+    "npm-run-all": "^4.1.5",
+    "qunit-dom": "^1.2.0",
+    "sass": "^1.26.7",
    "transform-loader": "^0.2.4",
    "tv4": "^1.3.0",
-    "web3-utils": "^1.0.0"
+    "web3-utils": "^1.2.8"
  },
  "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "10.* || >= 12"
+  },
+  "ember": {
+    "edition": "octane"
  }
 }
@@ -8,10 +8,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

    
-<meta name="kredits-web/config/environment" content="%7B%22modulePrefix%22%3A%22kredits-web%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_JQUERY_INTEGRATION%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.10.0%2B7b9659e2%22%7D%2C%22browserify%22%3A%7B%22tests%22%3Atrue%2C%22transform%22%3A%5B%5B%22babelify%22%2C%7B%22presets%22%3A%5B%22es2015%22%5D%2C%22global%22%3Atrue%7D%5D%5D%7D%2C%22web3ProviderUrl%22%3A%22https%3A%2F%2Frinkeby.infura.io%2Fv3%2Fd4f788b7a6584f7db2fc3c268d4d09e9%22%2C%22web3RequiredNetwork%22%3A%22rinkeby%22%2C%22githubConnectUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fconnect%2Fgithub%22%2C%22githubSignupUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fgithub%22%2C%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%2C%22gatewayUrl%22%3A%22https%3A%2F%2Fipfs.kosmos.org%2Fipfs%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<meta name="kredits-web/config/environment" content="%7B%22modulePrefix%22%3A%22kredits-web%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.17.0%2B733e5e36%22%7D%2C%22browserify%22%3A%7B%22tests%22%3Atrue%2C%22transform%22%3A%5B%5B%22babelify%22%2C%7B%22presets%22%3A%5B%22es2015%22%5D%2C%22global%22%3Atrue%7D%5D%5D%7D%2C%22web3ProviderUrl%22%3A%22https%3A%2F%2Frinkeby.infura.io%2Fv3%2Fd4f788b7a6584f7db2fc3c268d4d09e9%22%2C%22web3RequiredNetwork%22%3A%22rinkeby%22%2C%22githubConnectUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fconnect%2Fgithub%22%2C%22githubSignupUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fgithub%22%2C%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%2C%22gatewayUrl%22%3A%22https%3A%2F%2Fipfs.kosmos.org%2Fipfs%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />

-    <link integrity="" rel="stylesheet" href="/assets/vendor-179cf27a97ea5bbb0ce72403a401cc8c.css">
-    <link integrity="" rel="stylesheet" href="/assets/kredits-web-bf8cdb5aeca9f819317b56a053af9a07.css">
+    <link integrity="" rel="stylesheet" href="/assets/vendor-ca96b2e19fc9f356e3dbad90c9f3f323.css">
+    <link integrity="" rel="stylesheet" href="/assets/kredits-web-f225d49328a14feac0888a2126087423.css">

    

@@ -24,8 +24,8 @@
  <body>
    

-    <script src="/assets/vendor-13d8e4e4e82dd7bac91d821b2e30d995.js" integrity="sha256-7W4pPHJA775yfzH5yRprMaeGsW0iuMwhw2JwjXc2+Pk= sha512-fQfK5OmWIdSpGamuq7f3/EpCbVQnGSgR1VPXwxWRCu8JFeXdrUDmK67J4lHuC5cHc8yxD9WFymXKugeH7+NNgA==" ></script>
-    <script src="/assets/kredits-web-f1054baf811714b6865ab8c77c69fb4c.js" integrity="sha256-hrHVjH6k8rdA8LxWsKWsd300dN0+m/osbECl2U0ntZ8= sha512-L2xrymtmnW49TvaECYHqQ5Ql4lkEDERWveK1i66UbA3DddwdaFTjqPSLdj7kq6doX6TTlBdzfEDdsuwUjLyxeg==" ></script>
+    <script src="/assets/vendor-c96bc8b15817400d8cb58a32671bab0c.js" integrity="sha256-vRS2UvkDzerqXqzdCMPtGtxCDFflTcDv9xfi/8NLKJw= sha512-GWfVwFu8LhNRJyijvRuow7f38ARQGGCU0uKzB7HwiX+pQF6Vw5zSfZHtlfZiucFImmb2uyxSexiXkh16ulShEw==" ></script>
+    <script src="/assets/kredits-web-b7d7786c26ec2d9d78fc58c35d4e9c59.js" integrity="sha256-IUbTJl1JYq98BlScoUafRjtznFRb4LOaGC0weMP0ycU= sha512-kzcGqMHh8+3DLnSeTwK3Mw6Nr+JZw0EEjfMGx+c/D1OkAVvuKXYmUKq1b5XgFw+lQ7cDkGLiAb4ud6O4DpT3Jg==" ></script>

    
  </body>
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
  test_page: 'tests/index.html?hidepassed',
  disable_watching: true,
@@ -7,13 +9,13 @@ module.exports = {
  launch_in_dev: [
    'Chrome'
  ],
+  browser_start_timeout: 120,
  browser_args: {
    Chrome: {
      ci: [
        // --no-sandbox is needed when running Chrome inside a container
        process.env.CI ? '--no-sandbox' : null,
        '--headless',
-        '--disable-gpu',
        '--disable-dev-shm-usage',
        '--disable-software-rasterizer',
        '--mute-audio',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
basti	174073fc42	1.17.0	2020-06-02 11:55:29 +02:00
basti	733e5e3683	Merge pull request #191 from 67P/chore/update_dependencies Update dependencies	2020-06-02 11:52:10 +02:00
basti	090d1d0856	Update dependencies Fixes a bunch of security audit warnings in the process.	2020-06-02 11:25:35 +02:00
basti	e047cc45ba	Merge pull request #190 from 67P/feature/improve_contribution_sync Improve data sync	2020-06-02 10:55:36 +02:00
basti	c64a503546	Remove unused async from function Throws a linter warning, now that it's not an RSVP promise anymore.	2020-05-31 12:46:51 +02:00
basti	13021d665d	Merge pull request #188 from 67P/feature/schema_updates Add new contribution kinds	2020-05-31 10:45:16 +02:00
basti	b5dbb2449d	Merge pull request #189 from 67P/feature/data_loading Cache data in browser storage, and load from local cache when present	2020-05-31 10:44:36 +02:00
basti	302c3315a3	Update debug logs while fetching past contributions	2020-05-29 22:28:42 +02:00
basti	bac4c1c425	Load all past contributions once everything else is loaded	2020-05-29 22:04:03 +02:00
basti	c54d754c89	Only sync contributions if loaded from cache	2020-05-29 20:55:19 +02:00
basti	63dd5430bc	WIP Sync contributions	2020-05-29 18:56:05 +02:00
basti	eb2c613ac9	Extract data loading from fetch methods	2020-05-29 13:12:39 +02:00
basti	bf6d9dbc31	Remove RSVP from kredits service Just native Promise will do.	2020-05-29 13:11:36 +02:00
basti	c491f10ec3	Remove obsolete utils	2020-05-28 14:18:30 +02:00
basti	d4b546bfcd	Load contributions from cache if present And then fetch more from network. Also, only load 30 from network before first render (with nothing cached), then load more after the page has rendered.	2020-05-28 13:59:10 +02:00
basti	69141a31c4	Process contribution data before loading models	2020-05-28 13:44:32 +02:00
basti	e7c9620bbe	Add network namespace for browser cache We want to be able to cache data from multiple networks side-by-side, without them interfering with each other.	2020-05-28 11:53:19 +02:00
basti	832de3c06f	Load contributors from cache if present And then update from network later	2020-05-28 11:33:47 +02:00
basti	50e1fc728c	Cache contributors in IndexedDB	2020-05-27 17:33:36 +02:00
basti	871731110b	Process contributor data Add util function for processing contributor data, and remove bignums, etc.	2020-05-27 16:27:08 +02:00
basti	f996c89dfe	Add localforage, basic cache service	2020-05-27 12:59:37 +02:00
basti	1d8e9ddf5d	Remove obsolete npm cache Travis config It's cached by default now	2020-05-27 11:19:23 +02:00
basti	352c9fe3ab	Add new contribution types	2020-05-27 11:15:42 +02:00
basti	e2a944ed5b	Update schemas package Use the new one from the org namespace.	2020-05-16 13:21:02 +02:00
basti	c57d4162d7	1.16.0	2020-05-16 11:28:23 +02:00
basti	41cc37d3eb	Merge pull request #186 from 67P/chore/upgrade_ember_and_deps Upgrade Ember and deps to 3.18/Octane	2020-05-11 13:18:58 +02:00
basti	081584a508	Remove obsolete file	2020-05-11 13:15:47 +02:00
basti	3cc01cce4e	Fix some minor template issues	2020-05-11 13:15:17 +02:00
basti	cedbe3cb3d	Formatting	2020-05-11 13:03:46 +02:00
basti	b8da04c145	Re-add contribution status class	2020-05-11 13:03:46 +02:00
galfert	009caa53e5	Fix typo in contribution-status helper The wrong property name caused an exception when trying to remove the observer.	2020-05-11 12:18:07 +02:00
basti	9a1f543921	Mark remaining template-lint issues as pending These need more updates outside of the templates, like e.g. Glimmer components and such.	2020-05-11 10:24:38 +02:00
basti	22300c2980	Fix actions, etc.	2020-05-11 10:21:23 +02:00
basti	018132034d	Fix github icon filename	2020-05-11 10:21:23 +02:00
basti	f5d7916556	Turn on warnings for observer usage	2020-05-11 10:21:23 +02:00
basti	12df28f7fd	Fix ESLint errors	2020-05-11 10:21:22 +02:00
basti	2f4f350a93	WIP Octanify the templates	2020-05-11 10:21:18 +02:00
basti	4946b3311d	Remove all proposal-related code We're not using proposals at the moment, so it's just in the way.	2020-05-10 10:25:06 +02:00
basti	cc2f91afce	Do not lint icon templates	2020-05-09 17:39:54 +02:00
basti	aa351cbe17	Move icon templates out of pod directory Glimmer components don't have extra markup around them, so we don't need the component JS files anymore. Also, we can easily ignore the icon templates when linting now.	2020-05-09 17:37:58 +02:00
basti	065c635580	Upgrade to latest Ember, etc.	2020-05-09 17:07:35 +02:00
basti	67e3c9a7c3	Merge pull request #185 from 67P/dependabot/npm_and_yarn/jquery-3.5.0 Bump jquery from 3.4.1 to 3.5.0	2020-04-30 19:54:31 +02:00
dependabot[bot]	4f4b3c5c17	Bump jquery from 3.4.1 to 3.5.0 Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-30 16:18:08 +00:00
basti	4f6bafa31e	Merge pull request #184 from 67P/dependabot/npm_and_yarn/acorn-5.7.4 Bump acorn from 5.7.3 to 5.7.4	2020-03-16 10:50:11 -05:00
dependabot[bot]	94846c6e00	Bump acorn from 5.7.3 to 5.7.4 Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] <support@github.com>	2020-03-16 12:37:30 +00:00
basti	45d553866e	Remove obsolete file	2019-12-14 16:35:13 +01:00
basti	8ac6e3ad3c	1.15.0	2019-12-14 12:06:28 +01:00
basti	215ad1d640	Merge pull request #180 from 67P/feature/add_contribution_with_params Add "give kredits" button to contributor profiles	2019-12-13 17:33:18 +01:00
basti	3f4cc39067	Refactor assignment Co-authored-by: Garret Alfert <alfert@wevelop.de>	2019-12-13 17:04:52 +01:00
basti	0a6b6180b9	Add "give kredits" button to contributor profiles closes #172	2019-12-12 17:33:08 +01:00
basti	536868002f	Support query params for adding contribution Just contributor ID, kind, and amount for now.	2019-12-10 18:16:54 +01:00
basti	04a7f9139d	Allow partial override of contribution attributes	2019-12-10 13:40:08 +03:00
basti	863b542e3e	Add failing test for partial attribute override Currently the default attributes are only set correctly when either none or all attributes are handed to the component	2019-12-10 13:18:21 +03:00
basti	23d86f1502	Add unit test for add-contribution component	2019-12-10 13:09:30 +03:00
basti	314cf58c29	1.14.0	2019-12-02 15:59:30 +01:00
basti	9c063b82f1	Merge pull request #169 from 67P/feature/163-small_screen_details_new Show contributor/contribution details on mobile	2019-12-02 15:57:22 +01:00
basti	b397e4faf6	Merge pull request #168 from 67P/bugfix/ios_button_styling Reset iOS button styling	2019-11-29 21:07:35 +01:00
galfert	256197094e	Don't show intro text on details page	2019-11-29 18:06:32 +01:00
galfert	9898d4bb1d	Show contributor/contribution details on mobile Refs #163 On small screens, when selecting a contribution or contributor, the lists are hidden and only the details are shown.	2019-11-29 18:05:52 +01:00
galfert	c321dc51b0	Reset iOS button styling Removes the pill shaped, shaded button styling on iOS.	2019-11-29 17:44:22 +01:00
basti	8c759601ca	1.13.0	2019-11-27 15:22:02 +01:00
galfert	15e5d3c2fb	Merge pull request #166 from 67P/feature/welcome_text Add intro, fix topbar on mobile, fix filter button	2019-11-27 13:50:31 +01:00
basti	47b7a6501b	Add intro text for new users closes #164	2019-11-27 12:39:49 +01:00
basti	42304a8e27	Fix account panel breaking out of topbar on mobile refs #163	2019-11-27 11:55:08 +01:00
basti	9a4db6daf6	Do not require account for filtering contributions	2019-11-27 11:00:10 +01:00
basti	26dc78f553	1.12.0	2019-11-22 12:30:20 +01:00
galfert	5a618f7ef9	Merge pull request #165 from 67P/feature/161-copy_contribution Add copy/re-submit button to all contribution details	2019-11-22 11:55:03 +01:00
basti	5d29bd9604	Add copy/re-submit button to all contribution details We can in fact just use the exact same re-submission as for vetoed contributions. So all that is needed is a new button in the UI. closes #161	2019-11-21 21:13:42 +01:00
basti	97cc71024f	Merge pull request #160 from 67P/bugfix/remove_redundant_pending_status Remove redundant pending status from contribution-status helper	2019-11-15 16:59:50 +01:00
galfert	58f1382df1	Fix helper test filename Files that don't end with '-test', will not be run.	2019-11-15 16:23:28 +01:00
galfert	6c5406c0b9	Remove redundant pending status from contribution-status helper	2019-11-15 15:28:46 +01:00
basti	b2457421be	1.11.0	2019-10-18 17:38:50 +02:00
basti	134eb7d355	Update deps Fixes security vulns	2019-10-18 17:36:55 +02:00
basti	1dc1a9767e	Merge pull request #159 from 67P/feature/pending_changes Gracefully handle pending changes for contributions	2019-10-18 17:31:41 +02:00
galfert	243a41db88	Remove volatile() property modifier The modifier got deprecated and wasn't actually needed in any of the used cases.	2019-10-18 16:39:10 +02:00
galfert	523d4524b5	Make contribution-status helper detect pending changes	2019-10-18 16:37:44 +02:00
galfert	c21613f20a	Merge branch 'master' into feature/pending_changes	2019-10-18 15:17:41 +02:00
basti	12b127c75d	Merge pull request #158 from 67P/feature/recompute_helper Make contribution-status helper recompute	2019-10-18 09:56:50 +02:00
basti	a7dd058d21	Remove obsolete parens	2019-10-18 09:52:38 +02:00
basti	de6606b29d	Merge pull request #156 from 67P/feature/profile_zoom Add support for Zoom display name in profiles	2019-09-20 23:51:35 +02:00
basti	ec701b3130	Update lockfile	2019-09-20 23:45:33 +02:00
galfert	8e7430ebb9	Make contribution-status helper recompute When any of the depending properties of the contribution changes, the helper recomputes its output.	2019-09-20 18:27:40 +02:00
basti	1deecafee7	Handle pending changes for contributions This adds the pending tx data to pending contributions (after adding or vetoing, until the tx is mined). It also disables the veto button while pending.	2019-09-20 15:43:34 +02:00
basti	51d8b6c8c1	Respect disabled button color for all buttons	2019-09-20 15:40:22 +02:00
bumi	b28f6e6bd7	Use official kredits-contracts npm release	2019-09-20 11:17:38 +02:00
basti	4ab28016a3	Depend on contracts master PR has been merged	2019-09-18 09:38:10 +02:00
basti	6995b67a22	Add support for Zoom display name in profiles	2019-09-18 09:35:24 +02:00
basti	0076d59a42	Remove obsolete ID from icon markup	2019-09-18 09:35:06 +02:00
basti	36b92d97ca	Use configured IPFS gateway URL on contributor profile	2019-09-18 09:34:11 +02:00
basti	f272bcfcbc	Prevent transition abortion on contributor save	2019-09-18 09:32:57 +02:00
basti	985e1673ac	Add Zoom icon	2019-09-18 09:31:58 +02:00