1.12.0

Add copy/re-submit button to all contribution details

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: 'module'
   },
   globals: {
@@ -41,7 +41,15 @@ module.exports = {
       env: {
         browser: false,
         node: true
-      }
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off'
+      })
     }
   ]
 };

.github/release-drafter.yml

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

.template-lintrc.js

@@ -4,6 +4,7 @@ module.exports = {
   extends: 'recommended',
 
   rules: {
-    'simple-unless': false
+    'simple-unless': false,
+    'no-nested-interactive': false
   }
 };

.travis.yml

@@ -6,6 +6,11 @@ node_js:
 sudo: false
 dist: xenial
 
+notifications:
+  email:
+    on_success: never
+    on_failure: always
+
 addons:
   chrome: stable
 
@@ -18,9 +23,6 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
-before_install:
-  - npm config set spin false
-
 script:
   - npm run lint:hbs
   - npm run lint:js

README.md

@@ -71,20 +71,20 @@ These are the basic steps to get up and running:
 
 #### 1. IPFS
 
-Run a local IPFS deamon in offline mode.
+Run a local IPFS deamon.
 
   * Make sure CORS headers are configured. See [IPFS](#ipfs) for more info.
-  * `ipfs daemon --offline`
+  * `ipfs daemon`
 
 #### 2. kredits-contracts
 
-Get your local Ethereum development node running. (See [kredits-contracts README](https://github.com/67P/kredits-contracts) 
+Get your local Ethereum development node running. (See [kredits-contracts README](https://github.com/67P/kredits-contracts)
 for details.
 
   * Clone [kredits-contracts](https://github.com/67P/kredits-contracts)
   * `npm install`
   * `npm run devchain` - runs a local development chain
-  * `npm run bootstrap` - bootstrap runs deploys all the contracts 
+  * `npm run bootstrap` - bootstrap runs deploys all the contracts
   * `npm link` - make the `kredits-contracts` module linkable as `kredits-contracts` on your machine (currently broken :( )
 
 #### 3. kredits-web
@@ -94,10 +94,15 @@ With IPFS and Ethereum/ganache running, you can now start this Ember app.
   * `npm link kredits-contracts` - link the local `kredits-contracts` package
   * `npm run start:local` - WEB3_PROVIDER_URL=http://localhost:7545 must be set for local settings
 
-If you restart the devchain your network ID changes. So kredits-contracts does not find the correct DAO Kernel address. 
+If you restart the devchain your network ID changes. So kredits-contracts does not find the correct DAO address.
-If that is the case the DAO address must be provided as `KREDITS_KERNEL_ADDRESS` environment variable.
+If that is the case the DAO address must be provided as `KREDITS_DAO_ADDRESS` environment variable.
 
-  * `KREDITS_KERNEL_ADDRESS=<0xYOURADDRESS> npm run start:local` - find your address with the `npm run dao:address` command in the kredits-contracts repo.
+  * `npm run dao:address` in the kredits-contracts repo to find your address
+  * `KREDITS_DAO_ADDRESS=<0xYOURADDRESS> npm run start:local`
+
+#### 4. Metamask network
+
+Switch the network in Metamask to "Custom RPC" with the RPC URL `http://localhost:7545`.
 
 #### IPFS
 
@@ -107,6 +112,7 @@ Install IPFS with your favorite package manager and run
     ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["localhost:4200"]'
     ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "GET", "POST"]'
     ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials '["true"]'
+    ipfs config Addresses.Gateway /ip4/127.0.0.1/tcp/8080
 
 ## Further Reading / Useful Links
 

app/components/add-contribution/component.js

@@ -1,6 +1,8 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { and, notEmpty } from '@ember/object/computed';
+import { isEmpty } from '@ember/utils';
+import moment from 'moment';
 
 export default Component.extend({
 
@@ -21,17 +23,20 @@ export default Component.extend({
 
   init () {
     this._super(...arguments);
-    this.set('defaultDate', new Date());
+    this.set('defaultDate', moment().startOf('hour').toDate());
 
     // Default attributes used by reset
-    this.set('attributes', {
+    if (isEmpty(this.attributes)) {
-      contributorId: null,
+      this.set('attributes', {
-      kind: null,
+        contributorId: null,
-      date: [new Date()],
+        kind: null,
-      amount: null,
+        date: this.defaultDate,
-      description: null,
+        amount: null,
-      url: null,
+        description: null,
-    });
+        url: null,
+        details: null
+      });
+    }
 
     this.reset();
   },
@@ -49,8 +54,12 @@ export default Component.extend({
       }
 
       const attributes = this.getProperties(Object.keys(this.attributes));
-      const [ date/* , time */ ] = attributes.date[0].toISOString().split('T');
+
-      attributes.date = date;
+      let dateInput = (attributes.date instanceof Array) ?
+        attributes.date[0] : attributes.date;
+
+      const [ date, time ] = dateInput.toISOString().split('T');
+      [ attributes.date, attributes.time ] = [ date, time ];
 
       this.set('inProgress', true);
 
@@ -62,7 +71,6 @@ export default Component.extend({
           window.alert('Something went wrong. Check the browser console for details.');
         })
         .finally(() => this.set('inProgress', false));
-
     }
 
   }

app/components/add-contribution/template.hbs

@@ -1,54 +1,79 @@
 <form {{action "submit" on="submit"}}>
-  <p>
+  <label>
-    <select required onchange={{action (mut contributorId) value="target.value"}}>
+    <p class="label">Contributor:</p>
-      <option value="" selected disabled hidden>Contributor</option>
+    <p>
-      {{#each contributors as |contributor|}}
+      <select required onchange={{action (mut contributorId) value="target.value"}}>
-        <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
+        <option value="" selected disabled hidden></option>
-      {{/each}}
+        {{#each contributors as |contributor|}}
-    </select>
+          <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
-  </p>
+        {{/each}}
-  <p>
+      </select>
-    <select required onchange={{action (mut kind) value="target.value"}}>
+    </p>
-      <option value="" selected disabled hidden>Kind</option>
+  </label>
-      <option value="community" selected={{eq kind "community"}}>Community</option>
+  <label>
-      <option value="design" selected={{eq kind "design"}}>Design</option>
+    <p class="label">Kind:</p>
-      <option value="dev" selected={{eq kind "dev"}}>Development</option>
+    <p>
-      <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
+      <select required onchange={{action (mut kind) value="target.value"}}>
-      <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
+        <option value="" selected disabled hidden></option>
-      <option value="special" selected={{eq kind "special"}}>Special</option>
+        <option value="community" selected={{eq kind "community"}}>Community</option>
-    </select>
+        <option value="design" selected={{eq kind "design"}}>Design</option>
-  </p>
+        <option value="dev" selected={{eq kind "dev"}}>Development</option>
-  <p>
+        <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
-    {{ember-flatpickr
+        <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
-      allowInput=false
+        <option value="special" selected={{eq kind "special"}}>Special</option>
-      altFormat="F j, Y"
+      </select>
-      altInput=true
+    </p>
-      altInputClass="date-alt"
+  </label>
-      date=date
+  <label>
-      dateFormat="Y-m-d"
+    <p class="label">Date:</p>
-      defaultDate=defaultDate
+    <p>
-      maxDate=defaultDate
+      {{ember-flatpickr
-      onChange=(action (mut date))
+        date=date
-    }}
+        defaultDate=defaultDate
-  </p>
+        maxDate=defaultDate
-  <p>
+        enableTime=true
-    {{input type="text"
+        time_24hr=true
-            placeholder="500"
+        onChange=(action (mut date))
-            value=amount
+      }}
-            class=(if isValidAmount "valid" "")}}
+    </p>
-  </p>
+  </label>
-  <p>
+  <label>
-    {{input type="text"
+    <p class="label">Amount:</p>
-            placeholder="Description"
+    <p>
-            value=description
+      {{input type="text"
-            class=(if isValidDescription "valid" "")}}
+              placeholder="500"
-  </p>
+              value=amount
-  <p>
+              class=(if isValidAmount "valid" "")}}
-    {{input type="text"
+    </p>
-            placeholder="URL (optional)"
+  </label>
-            value=url
+  <label>
-            class=(if isValidUrl "valid" "")}}
+    <p class="label">Description:</p>
-  </p>
+    <p>
+      {{input type="text"
+              value=description
+              class=(if isValidDescription "valid" "")}}
+    </p>
+  </label>
+  <label>
+    <p class="label">URL (optional):</p>
+    <p>
+      {{input type="text"
+              value=url
+              class=(if isValidUrl "valid" "")}}
+    </p>
+  </label>
+
+  {{#if details}}
+    <label>
+      <p class="label">Details:</p>
+      <p>
+        <pre>
+          {{details}}
+        </pre>
+      </p>
+    </label>
+  {{/if}}
+
   <p class="actions">
     {{input type="submit"
             disabled=inProgress

app/components/add-contributor/component.js

@@ -1,22 +1,29 @@
 import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { and, notEmpty } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { isPresent } from '@ember/utils';
+import { isAddress } from 'web3-utils';
 
 export default Component.extend({
 
   kredits: service(),
+  router: service(),
 
   attributes: null,
 
-  // TODO: add proper address validation
+  isValidAccount: computed('account', function() {
-  isValidAccount: notEmpty('account'),
+    return isAddress(this.account);
+  }),
+
   isValidName: notEmpty('name'),
   isValidURL: notEmpty('url'),
   isValidGithubUID: notEmpty('github_uid'),
   isValidGithubUsername: notEmpty('github_username'),
   isValidGiteaUsername: notEmpty('gitea_username'),
   isValidWikiUsername: notEmpty('wiki_username'),
+  isValidZoomDisplayName: notEmpty('zoom_display_name'),
+
   isValid: and(
     'isValidAccount',
     'isValidName',
@@ -42,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
     });
   },
 
@@ -70,6 +78,7 @@ export default Component.extend({
         window.alert('Something went wrong. Please check the browser console.');
       }).finally(() => {
         this.set('inProgress', false);
+        this.router.transitionTo('dashboard');
       });
     }
 

app/components/add-contributor/template.hbs

@@ -43,6 +43,11 @@
     {{input name="wiki_username" type="text" value=wiki_username placeholder="ZeroCool"
             class=(if 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=zoom_display_name placeholder="Zero Cool"
+            class=(if isValidZoomDisplayName "valid" "") id="c-zoom-display-name"}}
+  </p>
   <p class="actions">
     {{input type="submit" disabled=inProgress
             value=(if inProgress "Processing" "Save")}}

app/components/contribution-list/component.js

@@ -1,9 +1,57 @@
 import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { sort } from '@ember/object/computed';
+import { isPresent } from '@ember/utils';
+import { inject as service } from '@ember/service';
 
 export default Component.extend({
 
-  tagName: 'ul',
+  router: service(),
-  classNames: ['contribution-list'],
+
+  tagName: 'div',
+  classNames: ['contributions'],
+
+  selectedContribution: null,
+
+  showQuickFilter: false,
+  hideSmallContributions: false,
+  contributorId: null,
+  contributionKind: null,
+
+  kredits: service(),
+
+  contributorsSorting: Object.freeze(['name:asc']),
+  contributors: sort('kredits.contributors', 'contributorsSorting'),
+
+  contributorsActive: computed('contributors.[]', 'contributions', function() {
+    let activeIds = this.contributions.mapBy('contributorId')
+                                      .map(id => id.toString())
+                                      .uniq();
+    return this.contributors.filter(c => {
+      return activeIds.includes(c.id.toString());
+    });
+  }),
+
+  contributionKinds: computed('contributions.[]', function() {
+    return this.contributions.mapBy('kind').uniq();
+  }),
+
+  contributionsFiltered: computed('contributions.[]', 'hideSmallContributions', 'contributorId', 'contributionKind', function() {
+    return this.contributions.filter(c => {
+      let included = true;
+
+      if (this.hideSmallContributions &&
+          c.amount <= 500) { included = false; }
+
+      if (isPresent(this.contributorId) &&
+          c.contributorId.toString() !== this.contributorId.toString()) { included = false; }
+
+      if (isPresent(this.contributionKind) &&
+          c.kind !== this.contributionKind) { included = false; }
+
+      return included;
+    });
+  }),
 
   actions: {
 
@@ -13,6 +61,10 @@ export default Component.extend({
       } else {
         window.alert('Only members can veto contributions. Please ask someone to set you up.');
       }
+    },
+
+    openContributionDetails(contribution) {
+      this.router.transitionTo('dashboard.contributions.show', contribution);
     }
 
   }

app/components/contribution-list/template.hbs

@@ -1,25 +1,57 @@
-{{#each contributions as |contribution|}}
+{{#if showQuickFilter}}
-  <li data-contribution-id={{contribution.id}} class="{{contribution-status contribution}} {{if contribution.vetoed "vetoed"}}">
+  <div class="quick-filter">
-    <p class="meta">
+    <p>
-      <span class="recipient">{{user-avatar contributor=contribution.contributor}}</span>
+      <label class="filter-contributor">
-      <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
+        Contributor:
-      <span class="title">
+        <select onchange={{action (mut contributorId) value="target.value"}}>
-        {{#if contribution.url}}
+          <option value="" selected>all</option>
-          <a href={{contribution.url}} target="_blank" rel="noopener">{{contribution.description}}</a>
+          {{#each contributorsActive as |contributor|}}
-        {{else}}
+            <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
-          {{contribution.description}}
+          {{/each}}
-        {{/if}}
+        </select>
-      </span>
+      </label>
+
+      <label class="filter-contribution-kind">
+        Kind:
+        <select onchange={{action (mut 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}}
+        </select>
+      </label>
+
+      <label class="filter-contribution-size">
+        {{input type="checkbox" checked=hideSmallContributions}}
+        Hide small contributions
+      </label>
     </p>
-    <p class="kredits-amount">
+  </div>
-      <span class="amount">{{contribution.amount}}</span><span class="symbol">₭S</span>
+{{/if}}
-    </p>
+
-    {{#unless contribution.vetoed}}
+<ul class="contribution-list">
-      {{#unless (is-confirmed-contribution contribution)}}
+  {{#each contributionsFiltered as |contribution|}}
-        <p class="voting">
+    <li role="button" {{action "openContributionDetails" contribution}}
-          <button {{action "veto" contribution.id}} class="small danger">veto</button>
+        data-contribution-id={{contribution.id}}
-        </p>
+        class="{{contribution-status contribution}}{{if (eq contribution.id selectedContributionId) " selected"}}">
+      <p class="meta">
+        <span class="recipient">{{user-avatar contributor=contribution.contributor}}</span>
+        <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
+        <span class="title">{{contribution.description}}</span>
+      </p>
+      <p class="kredits-amount">
+        <span class="amount">{{contribution.amount}}</span><span class="symbol">₭S</span>
+      </p>
+      {{#unless contribution.vetoed}}
+        {{#unless (is-confirmed-contribution contribution)}}
+          <p class="voting">
+            {{input type="button" class="button small danger"
+                    click=(action "veto" contribution.id)
+                    disabled=contribution.hasPendingChanges
+                    value="veto"}}
+          </p>
+        {{/unless}}
       {{/unless}}
-    {{/unless}}
+    </li>
-  </li>
+  {{/each}}
-{{/each}}
+</ul>

app/components/contributor-list/component.js

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

app/components/contributor-list/template.hbs

@@ -1,6 +1,7 @@
 <tbody>
   {{#each contributorList as |c|}}
-    <tr role="button" class={{if (is-current-user c.contributor) "current-user"}} {{action "toggleContributorInfo" 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>
@@ -15,25 +16,5 @@
         <span class="symbol">₭S</span>
       </td>
     </tr>
-    <tr class="metadata {{if (is-current-user c.contributor) "current-user"}} {{if c.showMetadata "visible"}}">
-      <td colspan="2">
-        <ul>
-          <li>
-            <a href="https://rinkeby.etherscan.io/address/{{c.contributor.account}}" target="_blank" rel="noopener">Inspect Ethereum transactions</a>
-          </li>
-          {{#if c.contributor.ipfsHash}}
-            <li>
-              <a href="https://ipfs.io/ipfs/{{c.contributor.ipfsHash}}" target="_blank" rel="noopener">Inspect IPFS profile</a>
-            </li>
-          {{/if}}
-          <li>
-            {{link-to "Edit profile" "contributors.edit" c.contributor.id}}
-          </li>
-        </ul>
-        {{#if c.showMetadata}}
-          <pre>{{c.contributor.ipfsData}}</pre>
-        {{/if}}
-      </td>
-    </tr>
   {{/each}}
 </tbody>

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

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

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

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

app/components/icon-account-gitea-kosmos-org/component.js

@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ""
+});

app/components/icon-account-github-com/component.js

@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ""
+});

app/components/icon-account-github-com/template.hbs

@@ -0,0 +1,8 @@
+<svg class="icon-github" width="260" height="260" enable-background="new 0 0 212.4575 186.23" version="1.1" viewBox="0 0 260 260" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <g transform="translate(23.766 36.885)">
+    <path d="m151.79 86.234c-7.078 0.1229-14.154 0.5605-21.232 0.7069-12.318 0.248-24.64 0.5664-36.961 0.512-11.176-0.0472-22.358-0.9728-33.518-0.7052-7.3164 0.1776-14.373 2.2948-20.131 7.584-9.9472 9.1368-12.522 21-11.314 33.807 1.92 20.357 9.2716 31.449 29.115 37.064 15.793 4.4704 31.963 5.2088 48.199 4.9744 5.254 0 10.51 0.1367 15.758-0.0292 12.723-0.4064 25.264-2.2072 37.358-6.3596 10.846-3.7225 18.799-10.691 22.572-22.166 2.6736-8.1288 3.7148-16.388 2.5544-24.853-1.7772-12.959-13.275-30.86-32.4-30.535zm-81.576 59.996c-8.836 0-16-8.9551-16-20 0-11.045 7.164-20 16-20s16 8.9553 16 20c0 11.045-7.164 20-16 20zm76 0c-8.836 0-16-8.9551-16-20 0-11.045 7.164-20 16-20s16 8.9553 16 20c0 11.045-7.164 20-16 20z" fill="none"/>
+    <path class="fg" d="m200.25 59.188c-2.5076-3.4493-4.3632-6.3888-3.8748-11.44 0.6796-7.0664-0.3536-14.396-1.3204-21.518-1.2188-8.9843-3.5236-17.74-7.1776-26.23-9.0332 1.9356-17.981 3.49-25.963 8.0976-8.4648 4.8908-16.695 10.215-25.08 15.25-0.9532 0.5704-2.3124 0.8848-3.3848 0.7032-17.967-3.1368-35.92-3.0196-53.898-0.086-1.3632 0.2244-3.0724-0.2345-4.2948-0.9608-4.4436-2.6604-8.6564-5.7344-13.123-8.3516-11.656-6.844-23.66-12.822-37.494-14.59-0.3928 0.8597-0.7188 1.4785-0.9612 2.1253-4.164 11.22-6.6424 22.844-7.4276 34.82-0.2872 4.3516-0.6092 8.8048 0 13.072 0.3456 2.4296-4e-3 3.8788-1.3924 5.6132-4.8516 6.0488-8.6368 12.717-11.102 20.219-4.6972 14.295-4.4004 28.861-2.2756 43.475 1.7268 11.974 4.7344 23.537 11.324 33.873 13.186 20.682 32.892 29.774 55.572 31.705 19.308 1.6464 38.8 1.1992 58.213 1.2364 13.855 0.0251 27.57-1.4924 40.715-6.6389 20.375-7.9727 33.859-22.604 40.275-44.166 3.7344-12.545 5.2324-25.396 4.8144-38.498-0.4412-13.81-4.0504-26.566-12.144-37.711zm-18.609 82.435c-3.7736 11.475-11.727 18.444-22.572 22.166-12.094 4.1524-24.635 5.9532-37.358 6.3596-5.248 0.1659-10.504 0.0292-15.758 0.0292-16.236 0.2344-32.406-0.504-48.199-4.9744-19.844-5.6152-27.195-16.707-29.115-37.064-1.2072-12.807 1.3672-24.67 11.314-33.807 5.7576-5.2892 12.814-7.4064 20.131-7.584 11.16-0.2676 22.342 0.658 33.518 0.7052 12.32 0.0544 24.642-0.264 36.961-0.512 7.0784-0.1464 14.154-0.584 21.232-0.7069 19.125-0.3243 30.623 17.576 32.4 30.535 1.1604 8.4647 0.1192 16.724-2.5544 24.853z"/>
+    <ellipse class="fg" cx="70.214" cy="126.23" rx="16" ry="20"/>
+    <ellipse class="fg" cx="146.21" cy="126.23" rx="16" ry="20"/>
+  </g>
+</svg>

app/components/icon-account-wiki-kosmos-org/component.js

@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ""
+});

app/components/icon-account-wiki-kosmos-org/template.hbs

@@ -0,0 +1,8 @@
+<svg class="icon-wiki" width="120" height="120" version="1.1" viewBox="0 0 120 120" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <g transform="translate(18.1,3)">
+    <polygon class="fg" transform="translate(-6.2,9)" points="6.2 5 45.7 20.5 45.7 91 6.2 75.5"/>
+    <polygon class="fg" transform="translate(-6.2,9)" points="90 5 50.5 20.5 50.5 91 90 75.5"/>
+    <polygon class="fg" transform="translate(-6.2,9)" points="87 88 87 81.8 60.4 91"/>
+    <polygon class="fg" transform="translate(-6.2,9)" points="9.2 88 9.2 81.8 34.9 91"/>
+  </g>
+</svg>

app/components/icon-account-zoom-us/component.js

@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ""
+});

app/components/icon-account-zoom-us/template.hbs

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

app/components/icon-warning/component.js

@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ""
+});

app/components/icon-warning/template.hbs

@@ -0,0 +1,15 @@
+<svg width="60px" height="60px" version="1.1" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <g fill="none" fill-rule="evenodd">
+    <g transform="translate(-479,-238)" stroke="#fbe468" stroke-linecap="round" stroke-linejoin="round" stroke-width="1">
+      <g transform="translate(482,244)">
+        <a transform="translate(0,2)">
+          <polygon id="Triangle-58" points="0.15321 44 27 0 53.847 44"/>
+        </a>
+        <rect x="25" y="13" width="4" height="21"/>
+        <a transform="translate(0,2)">
+          <circle cx="27" cy="38" r="2"/>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>

app/components/icon-web-globe/component.js

@@ -0,0 +1,5 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: ""
+});

app/components/icon-web-globe/template.hbs

@@ -0,0 +1,3 @@
+<svg class="icon-web-globe" width="60" height="60" enable-background="new 0 0 64 64" version="1.1" viewBox="0 0 60 60" 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#">
+  <path class="fg" d="m48.1 14.3c-0.4-0.5-0.9-1-1.4-1.5-4.3-4.2-10.2-6.8-16.7-6.8s-12.4 2.6-16.7 6.8c-0.5 0.5-1 1-1.4 1.5-3.7 4.2-5.9 9.7-5.9 15.7s2.2 11.5 5.8 15.7c0.4 0.5 0.9 1 1.4 1.5 4.3 4.2 10.3 6.8 16.8 6.8s12.5-2.6 16.8-6.9c0.5-0.5 0.9-0.9 1.4-1.5 3.6-4.1 5.8-9.6 5.8-15.6s-2.2-11.5-5.9-15.7zm3.9 14.7h-8.1c-0.1-3-1-7.3-2.4-10.5 1.8-0.8 3.5-1.8 5.1-3 3.1 3.6 5.1 8.5 5.4 13.5zm-21-20.1c3 2.3 5.8 5.2 7.6 8.5-2.4 0.9-4.6 1.3-7.6 1.4zm-2 9.9c-3-0.1-5.2-0.6-7.6-1.4 1.8-3.3 4.6-6.3 7.6-8.5zm0 2v8.2h-10.8c0.1-3 0.9-6.8 2.3-9.8 2.7 1 5.5 1.5 8.5 1.6zm0 10.2v8c-3 0.1-5.9 0.7-8.6 1.7-1.4-3-2.1-5.7-2.3-9.7zm0 10v10.1c-3-2.3-5.8-5.3-7.7-8.6 2.4-0.9 4.7-1.4 7.7-1.5zm2 0c3 0.1 5.3 0.6 7.7 1.5-1.9 3.4-4.7 6.3-7.7 8.6zm0-2v-8h10.8c-0.1 4-0.9 6.7-2.3 9.7-2.6-1-5.5-1.5-8.5-1.7zm0-10v-8.2c3-0.1 5.8-0.7 8.5-1.6 1.4 3 2.2 6.8 2.3 9.8zm9.5-12.3c-1.7-3.2-4.1-6-6.9-8.3 4.4 0.6 8.4 2.7 11.5 5.6-1.4 1.1-3 1.9-4.6 2.7zm-14.1-8.4c-2.9 2.3-5.2 5.2-6.9 8.3-1.6-0.7-3.2-1.6-4.6-2.6 3.1-2.9 7.1-5 11.5-5.7zm-12.9 7.2c1.6 1.2 3.3 2.2 5.1 3-1.5 3.3-2.3 7.5-2.4 10.5h-8.2c0.3-5 2.3-9.9 5.5-13.5zm-5.5 15.5h8.1c0.1 4 1 7.2 2.4 10.5-1.8 0.8-3.5 1.8-5.1 3-3.2-3.7-5.1-8.5-5.4-13.5zm11.4 12.2c1.7 3.2 4.1 6.1 7 8.4-4.5-0.7-8.5-2.8-11.6-5.8 1.5-1 3-1.8 4.6-2.6zm14.2 8.5c2.9-2.4 5.3-5.2 7-8.4 1.6 0.7 3.2 1.6 4.6 2.6-3.1 3-7.2 5-11.6 5.8zm13-7.3c-1.6-1.2-3.3-2.2-5.1-3 1.4-3.2 2.3-6.5 2.4-10.5h8.1c-0.3 5.1-2.2 9.9-5.4 13.5z"/>
+</svg>

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

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

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

@@ -0,0 +1,18 @@
+<section id="user-account">
+  {{#if setupInProgress}}
+    Connecting account...
+  {{else}}
+    {{#if (and kredits.hasAccounts kredits.currentUser)}}
+      {{kredits.currentUser.name}}
+      {{#if 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>
+      {{/if}}
+    {{/if}}
+  {{/if}}
+</section>

app/components/user-avatar/component.js

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

app/controllers/contributions/resubmit.js

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

app/controllers/contributors/edit.js

@@ -8,9 +8,7 @@ export default Controller.extend({
   actions: {
 
     save (attributes) {
-      return this.kredits
+      return this.kredits.updateContributor(this.model.id, attributes);
-                 .updateContributor(this.model.id, attributes)
-                 .then(() => this.transitionToRoute('index'))
     }
 
   }

app/controllers/contributors/new.js

@@ -8,9 +8,7 @@ export default Controller.extend({
   actions: {
 
     save (contributor) {
-      return this.kredits
+      return this.kredits.addContributor(contributor);
-                 .addContributor(contributor)
-                 .then(() => this.transitionToRoute('index'))
     }
 
   }

app/controllers/dashboard.js

@@ -5,13 +5,18 @@ import { inject as service } from '@ember/service';
 
 export default Controller.extend({
   kredits: service(),
+
+  showDetailsPane: false,
+  selectedContributorId: null,
+  selectedContributionId: null,
+
   currentBlock: alias('kredits.currentBlock'),
 
   contributions: alias('kredits.contributions'),
   contributionsConfirmed: alias('kredits.contributionsConfirmed'),
   contributionsUnconfirmed: alias('kredits.contributionsUnconfirmed'),
 
-  contributionsSorting: Object.freeze(['id:desc']),
+  contributionsSorting: Object.freeze(['date:desc', 'time:desc', 'id:desc']),
   contributionsUnconfirmedSorted: sort('contributionsUnconfirmed', 'contributionsSorting'),
   contributionsConfirmedSorted: sort('contributionsConfirmed', 'contributionsSorting'),
 
@@ -25,6 +30,9 @@ export default Controller.extend({
   showUnconfirmedKredits: true,
   hideUnconfirmedKredits: not('showUnconfirmedKredits'),
 
+  showQuickFilterUnconfirmed: false,
+  showQuickFilterConfirmed: false,
+
   actions: {
 
     vetoContribution (contributionId) {
@@ -37,6 +45,14 @@ export default Controller.extend({
       this.kredits.vote(proposalId).then(transaction => {
         console.debug('[controllers:index] Vote submitted to Ethereum blockhain: '+transaction.hash);
       });
+    },
+
+    toggleQuickFilterUnconfirmed () {
+      this.toggleProperty('showQuickFilterUnconfirmed');
+    },
+
+    toggleQuickFilterConfirmed () {
+      this.toggleProperty('showQuickFilterConfirmed');
     }
 
   }

app/controllers/dashboard/contributions/show.js

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

app/controllers/dashboard/contributors/show.js

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

app/controllers/signup/eth-account.js

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

app/controllers/signup/index.js

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

app/helpers/capitalize-string.js

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

app/helpers/contribution-status.js

@@ -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,50 @@ 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('hadPendingChanges', this, this.triggerRecompute);
+    };
+  },
+
+  triggerRecompute () {
+    once(this, function () {
+      this.recompute();
+    });
   }
 
 });

app/models/contribution.js

@@ -1,5 +1,7 @@
-import EmberObject from '@ember/object';
+import EmberObject, { computed } from '@ember/object';
+import { isEmpty, isPresent } from '@ember/utils';
 import bignumber from 'kredits-web/utils/cps/bignumber';
+import moment from 'moment';
 
 export default EmberObject.extend({
 
@@ -18,11 +20,27 @@ export default EmberObject.extend({
   description: null,
   details: null,
   url: null,
+  date: null,
+  time: null,
   ipfsData: '',
 
+  pendingTx: null,
+
   init () {
     this._super(...arguments);
-    this.set('details', {});
+    if (isEmpty(this.details)) this.set('details', {});
-  }
+  },
+
+  iso8601Date: computed('date', 'time', function() {
+    return this.time ? `${this.date}T${this.time}` : this.date;
+  }),
+
+  jsDate: computed('iso8601Date', function() {
+    return moment(this.iso8601Date).toDate();
+  }),
+
+  hasPendingChanges: computed('pendingTx', function() {
+    return isPresent(this.pendingTx);
+  })
 
 });

app/models/contributor.js

@@ -1,4 +1,3 @@
-import { computed } from '@ember/object';
 import EmberObject from '@ember/object';
 import bignumber from 'kredits-web/utils/cps/bignumber';
 import kreditsValue from 'kredits-web/utils/cps/kredits';
@@ -20,12 +19,7 @@ export default EmberObject.extend({
   github_username: null,
   github_uid: null,
   wiki_username: null,
-  ipfsData: '',
+  zoom_display_name: null,
+  ipfsData: ''
 
-  avatarURL: computed('github_uid', function() {
-    let github_uid = this.github_uid;
-    if (github_uid) {
-      return `https://avatars2.githubusercontent.com/u/${github_uid}?v=3&s=128`;
-    }
-  }),
 });

app/router.js

@@ -7,16 +7,31 @@ const Router = EmberRouter.extend({
 });
 
 Router.map(function() {
+  this.route('dashboard', function() {
+    this.route('contributors', function() {
+      this.route('show', { path: ':id' });
+    });
+
+    this.route('contributions', function() {
+      this.route('show', { path: ':id' });
+    });
+  });
   this.route('proposals', function() {
     this.route('new');
   });
   this.route('contributions', function() {
     this.route('new');
+    this.route('resubmit', { path: ':id/resubmit' });
   });
   this.route('contributors', function() {
     this.route('new');
     this.route('edit', { path: ':id/edit' });
   });
+  this.route('signup', function() {
+    this.route('github');
+    this.route('eth-account');
+    this.route('complete');
+  });
 });
 
 export default Router;

app/routes/application.js

@@ -4,7 +4,7 @@ import Route from '@ember/routing/route';
 export default Route.extend({
   kredits: service(),
 
-  beforeModel(transition) {
+  beforeModel(/* transition */) {
     const kredits = this.kredits;
 
     return kredits.setup().then(() => {
@@ -12,11 +12,6 @@ export default Route.extend({
         console.error('Kredits preflight check failed!');
         console.error(error);
       });
-      if (kredits.get('accountNeedsUnlock')) {
-        if (confirm('It looks like you have an Ethereum wallet available. Please unlock your account.')) {
-          transition.retry();
-        }
-      }
     }).catch((error) => {
       console.log('Error initializing Kredits', error);
     });

app/routes/contributions/resubmit.js

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

app/routes/contributors/edit.js

@@ -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
     });
   }
 

app/routes/dashboard/contributions/show.js

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

app/routes/dashboard/contributors/show.js

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

app/routes/index.js

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+
+  redirect () {
+    this.transitionTo('dashboard');
+  }
+
+});

app/routes/signup.js

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

app/routes/signup/complete.js

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

app/routes/signup/eth-account.js

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

app/routes/signup/github.js

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

app/services/kredits.js

@@ -1,12 +1,12 @@
-import ethers from 'npm:ethers';
+import ethers from 'ethers';
-import Kredits from 'npm:kredits-contracts';
+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 } from '@ember/utils';
+import { isEmpty, isPresent } from '@ember/utils';
 
 import groupBy from 'kredits-web/utils/group-by';
 import formatKredits from 'kredits-web/utils/format-kredits';
@@ -24,15 +24,12 @@ export default Service.extend({
   contributors: null,
   contributions: null,
   proposals: null,
+  githubAccessToken: null,
 
   currentUserIsContributor: notEmpty('currentUser'),
   currentUserIsCore: alias('currentUser.isCore'),
   hasAccounts: notEmpty('currentUserAccounts'),
 
-  accountNeedsUnlock: computed('currentUserAccounts', function() {
-    return this.currentUserAccounts && isEmpty(this.currentUserAccounts);
-  }),
-
   contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
     return this.contributions.filter(contribution => {
       return contribution.confirmedAt > this.currentBlock;
@@ -104,7 +101,14 @@ export default Service.extend({
       async function instantiateWithAccount (web3Provider, context) {
         console.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
         ethProvider = new ethers.providers.Web3Provider(web3Provider);
-        // const network = await ethProvider.getNetwork();
+
+        const network = await ethProvider.getNetwork();
+        if (isPresent(config.web3RequiredNetwork) &&
+            network.name !== config.web3RequiredNetwork) {
+          window.alert(`Please switch your Ethereum wallet to the "${config.web3RequiredNetwork}" network before connecting your account.`);
+          return instantiateWithoutAccount();
+        }
+
         ethProvider.listAccounts().then(accounts => {
           context.set('currentUserAccounts', accounts);
           const ethSigner = accounts.length === 0 ? null : ethProvider.getSigner();
@@ -116,12 +120,9 @@ export default Service.extend({
       }
 
       if (window.ethereum) {
-        try {
+        if (window.ethereum.isConnected()) {
-          // Request account access if needed
-          await window.ethereum.enable();
-          // Acccounts now exposed
           instantiateWithAccount(window.ethereum, this);
-        } catch (error) {
+        } else {
           instantiateWithoutAccount();
         }
       }
@@ -209,8 +210,8 @@ export default Service.extend({
 
   getContributors () {
     return this.kredits.Contributor.all()
-      .then((contributors) => {
+      .then(contributors => {
-        return contributors.map((contributor) => {
+        return contributors.map(contributor => {
           return Contributor.create(contributor);
         });
       });
@@ -224,33 +225,37 @@ export default Service.extend({
         console.debug('[kredits] add contribution response', data);
         attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
         const contribution = Contribution.create(attributes);
-        // TODO receive from wrapper
+        contribution.set('pendingTx', data);
         contribution.set('confirmedAtBlock', data.blockNumber + 40320);
         this.contributions.pushObject(contribution);
         return contribution;
       });
   },
 
-  addProposal (attributes) {
+  //
-    console.debug('[kredits] add proposal', attributes);
+  // TODO Implement proposals with voting
+  //
 
-    return this.kredits.Proposal.addProposal(attributes)
+  // addProposal (attributes) {
-      .then((data) => {
+  //   console.debug('[kredits] add proposal', attributes);
-        console.debug('[kredits] add proposal response', data);
+  //
-        attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
+  //   return this.kredits.Proposal.addProposal(attributes)
-        return Proposal.create(attributes);
+  //     .then((data) => {
-      });
+  //       console.debug('[kredits] add proposal response', data);
-  },
+  //       attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
+  //       return Proposal.create(attributes);
+  //     });
+  // },
 
-  getProposals () {
+  // getProposals () {
-    return this.kredits.Proposal.all()
+  //   return this.kredits.Proposal.all()
-      .then((proposals) => {
+  //     .then(proposals => {
-        return proposals.map((proposal) => {
+  //       return proposals.map(proposal => {
-          proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
+  //         proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
-          return Proposal.create(proposal);
+  //         return Proposal.create(proposal);
-        });
+  //       });
-      });
+  //     });
-  },
+  // },
 
   getContributions () {
     return this.kredits.Contribution.all({page: {size: 200}})
@@ -274,10 +279,12 @@ export default Service.extend({
 
   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;
       });
   },
@@ -310,6 +317,7 @@ export default Service.extend({
       .on('ContributorAdded', this.handleContributorChange.bind(this))
 
     this.kredits.Contribution
+      .on('ContributionAdded', this.handleContributionAdded.bind(this))
       .on('ContributionVetoed', this.handleContributionVetoed.bind(this))
 
     this.kredits.Proposal
@@ -337,6 +345,24 @@ export default Service.extend({
     this.contributors.pushObject(newContributor);
   },
 
+  async handleContributionAdded (id, contributorId, amount) {
+    console.debug('[kredits] ContributionAdded event received', { id, contributorId, amount });
+
+    const pendingContribution = this.contributions.find(c => {
+      return (c.id === null) &&
+             (c.contributorId.toString() === contributorId.toString()) &&
+             (c.amount.toString() === amount.toString());
+    });
+
+    if (pendingContribution) {
+      const attributes = await this.kredits.Contribution.getById(id);
+      attributes.contributor = this.contributors.findBy('id', attributes.contributorId.toString());
+      const newContribution = Contribution.create(attributes);
+      this.contributions.addObject(newContribution);
+      this.contributions.removeObject(pendingContribution);
+    }
+  },
+
   handleContributionVetoed (contributionId) {
     console.debug('[kredits] ContributionVetoed event received for ', contributionId);
     const contribution = this.contributions.findBy('id', contributionId);
@@ -344,6 +370,7 @@ export default Service.extend({
 
     if (contribution) {
       contribution.set('vetoed', true);
+      contribution.set('pendingTx', null);
     }
   },
 

app/styles/_buttons.scss

@@ -11,16 +11,28 @@ button, input[type=submit], .button {
   cursor: pointer;
   letter-spacing: 0.1em;
 
+  &+button, &+input[type=submit], &+.button {
+    margin-left: 0.5rem;
+  }
+
   &:hover {
     background-color: rgba(22, 21, 40, 0.8);
   }
 
+  &:active, &.active {
+    border-color: $primary-color;
+  }
+
+  &[disabled] {
+    color: rgba(255,255,255,0.5);
+  }
+
   &.small {
-    font-size: 0.8rem;
+    font-size: 0.86rem;
     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);
@@ -28,9 +40,12 @@ button, input[type=submit], .button {
     &:hover {
       background-color: rgba(40, 21, 21, 0.8);
     }
+    &:active, &.active {
+      border-color: $red;
+    }
   }
 
-  &.green {
+  &.green:not(:disabled) {
     color: $green;
     background-color: rgba(21, 40, 21, 0.6);
     border-color: rgba(21, 40, 21, 1);
@@ -38,5 +53,21 @@ button, input[type=submit], .button {
     &:hover {
       background-color: rgba(21, 40, 21, 0.8);
     }
+    &:active, &.active {
+      border-color: $green;
+    }
+  }
+
+  &.icon {
+    svg {
+      width: 2rem;
+      height: 2rem;
+      vertical-align: middle;
+      margin-right: 1rem;
+
+      .fg {
+        fill: $primary-color;
+      }
+    }
   }
 }

app/styles/_forms.scss

@@ -1,12 +1,21 @@
 section#add-contributor,
 section#add-contribution,
-section#add-proposal {
+section#add-proposal,
+section#signup {
 
   form {
 
     p {
       margin-bottom: 1.5rem;
 
+      &.mg-bottom-md {
+        margin-bottom: 2rem;
+      }
+      
+      &.label {
+        margin-bottom: .5rem;
+      }
+
       &.actions {
         padding-top: 1.5rem;
         text-align: center;

app/styles/_layout.scss

@@ -5,7 +5,7 @@ main {
     padding: 1rem;
   }
 
-  &#index {
+  &#dashboard {
     width: 100%;
     display: grid;
     grid-row-gap: 2rem;
@@ -28,16 +28,54 @@ main {
       }
     }
   }
+
+  section {
+    .content {
+      a {
+        font-size: inherit;
+      }
+
+      &.text-lg {
+        p {
+          font-size: 1.2rem;
+          margin-bottom: 1em;
+          line-height: 1.5em;
+        }
+      }
+
+      &.text-center {
+        text-align: center;
+      }
+
+      p {
+        &.mg-bottom-md {
+          margin-bottom: 2rem;
+        }
+
+        &.actions {
+          text-align: center;
+          padding-top: 2rem;
+        }
+      }
+    }
+  }
 }
 
 @media (min-width: 550px) {
   main {
-    &#index {
+    &#dashboard {
       grid-column-gap: 4rem;
       grid-row-gap: 2rem;
       grid-template-columns: 2fr 4fr;
       grid-template-areas:
         "stats contributions";
+
+      &.with-details {
+        grid-column-gap: 3rem;
+        grid-template-columns: 2fr 4fr 2fr;
+        grid-template-areas:
+          "stats contributions details";
+      }
     }
   }
 }

app/styles/app.scss

@@ -2,7 +2,6 @@
   margin: 0;
   padding: 0;
   box-sizing: border-box;
-  font-size: 14px;
 }
 
 *:hover, *:active, *:focus {
@@ -17,13 +16,17 @@
 
 $font-family-sans: 'Open Sans', sans-serif;
 
-body {
+html, body {
   font-family: $font-family-sans;
   font-weight: 300;
+  font-size: 12px;
+  color: $body-text-color;
+}
+
+body {
   background-image: linear-gradient(to bottom, rgba(22, 21, 40, .4), rgba(0, 0, 0, .75)), url('/img/bg.jpg');
   background-repeat: none;
   background-attachment: fixed;
-  color: $body-text-color;
 }
 
 @media screen and (min-width: 900px) {
@@ -38,6 +41,10 @@ h1, h2, h3, h4, h5, input, button {
   font-weight: 300;
 }
 
+a {
+  color: $primary-color;
+}
+
 section {
   h2 {
     font-size: 1.4rem;
@@ -97,9 +104,14 @@ section {
 
 @import "buttons";
 @import "forms";
-@import "components/topbar";
+
-@import "components/loading-spinner";
-@import "components/contributor-list";
-@import "components/proposal-list";
 @import "components/contribution-list";
+@import "components/contribution-details";
+@import "components/contributor-list";
+@import "components/contributor-profile";
+@import "components/external-account-link";
+@import "components/loading-spinner";
+@import "components/proposal-list";
+@import "components/topbar";
+@import "components/topbar-account-panel";
 @import "components/user-avatar";

app/styles/components/_contribution-details.scss

@@ -0,0 +1,88 @@
+section#contribution-details {
+  header {
+    nav {
+      .amount {
+        font-size: 1.5rem;
+      }
+
+      .symbol {
+        padding-left: 0.2rem;
+      }
+    }
+  }
+
+  .content {
+    width: 100%;
+    margin: 0 0 1.5rem;
+    padding: 2rem 2rem;
+
+    border-top: 1px solid rgba(255,255,255,0.2);
+    border-bottom: 1px solid rgba(255,255,255,0.2);
+    background-color: rgba(255,255,255,0.1);
+
+    h3 {
+      font-size: 1.5rem;
+      margin-bottom: 2rem;
+    }
+
+    p {
+      margin-bottom: 2rem;
+
+      span {
+      }
+
+      &.who-what-when {
+        font-size: 1.2rem;
+        margin-bottom: 1.2rem;
+      }
+
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+    }
+
+    a:not(.button) {
+      color: $primary-color;
+      text-decoration: none;
+
+      &:not(.button):hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  .actions {
+    text-align: center;
+  }
+
+  &.vetoed {
+    .content {
+      h3 {
+        text-decoration: line-through;
+      }
+    }
+  }
+
+  .hint.vetoed {
+    overflow: auto;
+    margin-top: 2rem;
+    padding-top: 2rem;
+    border-top: 1px solid rgba(255,255,255,0.2);
+    font-size: 1.2rem;
+
+    .icon {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      float: left;
+      margin-right: 1rem;
+      margin-bottom: 1rem;
+
+      svg {
+        width: 100%;
+        height: auto;
+      }
+    }
+  }
+
+}

app/styles/components/_contribution-list.scss

@@ -6,6 +6,21 @@ main section {
   }
 }
 
+.quick-filter {
+  font-size: 1.2rem;
+  margin-bottom: 2rem;
+
+  p {
+    padding: 0.2rem 0 0;
+  }
+
+  label {
+    &+ label {
+      margin-left: 3.6rem;
+    }
+  }
+}
+
 ul.contribution-list {
   clear: both;
   width: 100%;
@@ -19,6 +34,7 @@ ul.contribution-list {
     background-color: rgba(255,255,255,0.1);
     font-size: 1.2rem;
     border-bottom: 1px solid rgba(255,255,255,0.2);
+    cursor: pointer;
 
     &:first-of-type {
       border-top: 1px solid rgba(255,255,255,0.2);
@@ -34,11 +50,17 @@ ul.contribution-list {
       opacity: 0.6;
     }
 
+    &.selected {
+      background-color: rgba(255,255,255,0.2);
+    }
+
     p {
       align-self: center;
       margin: 0;
-      font-size: inherit;
       line-height: 2rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
 
       &.kredits-amount, &.voting {
         text-align: right;
@@ -46,11 +68,8 @@ ul.contribution-list {
     }
 
     span {
-      font-size: inherit;
-
       &.title {
         a {
-          font-size: inherit;
           text-decoration: none;
           color: $body-text-color;
         }
@@ -125,9 +144,7 @@ ul.contribution-list {
         }
       }
 
-
       .description {
-        font-size: inherit;
       }
     }
   }

app/styles/components/_contributor-list.scss

@@ -4,56 +4,20 @@ table.contributor-list {
   margin-bottom: 1.5rem;
 
   tr {
+    background-color: rgba(255,255,255,0.1);
     border-bottom: 1px solid rgba(255,255,255,0.2);
+    cursor: pointer;
+
     &:first-of-type {
       border-top: 1px solid rgba(255,255,255,0.2);
     }
-    background-color: rgba(255,255,255,0.1);
 
-    &.current-user {
+    &.selected {
       background-color: rgba(255,255,255,0.2);
     }
 
-    &.metadata {
+    &.current-user {
-      height: 0;
+      font-weight: 500;
-      visibility: hidden;
-
-      &:not(.visible) {
-        border-bottom: none;
-      }
-
-      td {
-        padding: 0 1.2rem;
-      }
-
-      a {
-        color: $primary-color;
-        &:hover, &:active {
-          color: #fff;
-        }
-      }
-
-      ul {
-        list-style: none;
-        display: block;
-        overflow: hidden;
-        height: 0;
-
-        li {
-          display: inline;
-          &+li {
-            margin-left: 1rem;
-          }
-        }
-      }
-
-      &.visible {
-        height: auto;
-        visibility: visible;
-        ul {
-          height: auto;
-        }
-      }
     }
 
     td {
@@ -71,20 +35,17 @@ table.contributor-list {
 
       &.kredits {
         text-align: right;
+
         .amount {
           font-size: 1.2rem;
           font-weight: 500;
         }
+
         .symbol {
           font-size: 0.8rem;
           padding-left: 0.2rem;
         }
       }
-
-      pre {
-        line-height: 1rem;
-        padding-bottom: 1rem;
-      }
     }
   }
 }

app/styles/components/_contributor-profile.scss

@@ -0,0 +1,52 @@
+section#contributor-profile {
+  text-align: center;
+
+  header {
+    z-index: 2;
+    width: 100%;
+    text-align: center;
+
+    img {
+      margin: 0 auto;
+      border: 3px solid rgba(255,255,255,0.2);
+    }
+  }
+
+  .content {
+    z-index: 1;
+    width: 100%;
+    margin: -7.2rem 0 1.5rem;
+    padding: 6rem 1.2rem 2rem;
+
+    border-top: 1px solid rgba(255,255,255,0.2);
+    border-bottom: 1px solid rgba(255,255,255,0.2);
+    background-color: rgba(255,255,255,0.1);
+
+    h2 {
+      text-align: center;
+      margin-bottom: 0.6rem;
+    }
+
+    p.role {
+      margin-bottom: 2rem;
+    }
+
+    ul.external-accounts {
+      list-style: none;
+
+      li {
+        display: inline-block;
+
+        &+li {
+          margin-left: 0.6rem;
+        }
+      }
+    }
+  }
+
+  .actions {
+    .button {
+      margin-bottom: 0.6rem;
+    }
+  }
+}

app/styles/components/_external-account-link.scss

@@ -0,0 +1,34 @@
+.external-accounts a {
+  display: inline-block;
+  width: 4rem;
+  height: 4rem;
+  padding: 0.8rem;
+  background-color: rgba(0, 0, 0, 0.3);
+  color: $body-text-color;
+  border-radius: 2rem;
+
+  span.site {
+    display: none;
+  }
+
+  svg {
+    display: block;
+    position: relative;
+    width: 100%;
+    height: 100%;
+
+    .fg {
+      fill: $body-text-color;
+    }
+  }
+
+  &:hover, &:active {
+    background-color: rgba(0, 0, 0, 0.5);
+
+    svg {
+      .fg {
+        fill: $primary-color;
+      }
+    }
+  }
+}

app/styles/components/_proposal-list.scss

@@ -19,7 +19,6 @@ ul.proposal-list {
     p {
       align-self: center;
       margin: 0;
-      font-size: inherit;
       line-height: 2rem;
 
       &.kredits-amount, &.voting {
@@ -36,7 +35,6 @@ ul.proposal-list {
     }
 
     span {
-      font-size: inherit;
     }
 
     .description {
@@ -107,7 +105,6 @@ ul.proposal-list {
 
 
       .description {
-        font-size: inherit;
       }
     }
   }

app/styles/components/_topbar-account-panel.scss

@@ -0,0 +1,11 @@
+header#topbar section#user-account {
+
+  button {
+    margin-left: 1.5rem;
+  }
+
+  button + button {
+    margin-left: 0.6rem;
+  }
+
+}

app/styles/components/_topbar.scss

@@ -13,6 +13,11 @@
   h1 {
     display: inline-block;
     text-transform: uppercase;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+    }
   }
 
   section#user-account {

app/styles/components/_user-avatar.scss

@@ -4,4 +4,18 @@ img.avatar {
   vertical-align: middle;
   margin-right: 0.2rem;
   border-radius: 1rem;
+
+  &.medium {
+    margin: 0;
+    width: 10rem;
+    height: 10rem;
+    border-radius: 5rem;
+  }
+
+  &.large {
+    margin: 0;
+    width: 256px;
+    height: 256px;
+    border-radius: 128px;
+  }
 }

app/templates/application.hbs

@@ -1,16 +1,6 @@
 <header id="topbar">
-  <h1>Kosmos Kredits</h1>
+  <h1>{{link-to "Kosmos Kredits" "dashboard"}}</h1>
-
+  {{topbar-account-panel}}
-  <section id="user-account">
-    {{#if kredits.hasAccounts }}
-      {{#if kredits.currentUser}}
-        {{kredits.currentUser.name}}
-        {{#if kredits.currentUserIsCore}}(core){{/if}}
-      {{/if}}
-    {{else}}
-      Anonymous
-    {{/if}}
-  </section>
 </header>
 
 {{outlet}}

app/templates/contributions/resubmit.hbs

@@ -0,0 +1,13 @@
+<main class="center-column">
+
+  <section id="add-contribution">
+    <header>
+      <h2>Re-submit contribution #{{model.id}}</h2>
+    </header>
+
+    <div class="content">
+      {{add-contribution attributes=attributes contributors=sortedContributors save=(action "save")}}
+    </div>
+  </section>
+
+</main>

app/templates/dashboard.hbs

@@ -1,4 +1,4 @@
-<main id="index">
+<main id="dashboard" class={{if showDetailsPane "with-details"}}>
 
   <div id="stats">
     <section id="people">
@@ -12,7 +12,8 @@
       </header>
       <div class="content">
         {{contributor-list contributorList=kreditsToplist
-                           showUnconfirmedKredits=showUnconfirmedKredits}}
+                           showUnconfirmedKredits=showUnconfirmedKredits
+                           selectedContributorId=selectedContributorId}}
 
         <p class="stats">
           <span class="number">{{await kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
@@ -42,6 +43,7 @@
           <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}}
@@ -50,20 +52,31 @@
           {{!-- TODO: We need a better naming for kredits.hasAccounts --}}
           {{contribution-list contributions=contributionsUnconfirmedSorted
                               vetoContribution=(action "vetoContribution")
-                              contractInteractionEnabled=kredits.hasAccounts}}
+                              contractInteractionEnabled=kredits.hasAccounts
+                              selectedContributionId=selectedContributionId
+                              showQuickFilter=showQuickFilterUnconfirmed}}
         </div>
       </section>
     {{/if}}
 
     <section id="contributions-confirmed">
-      <header>
+      <header class="with-nav">
         <h2>Confirmed Contributions</h2>
+        <nav>
+          <button {{action "toggleQuickFilterConfirmed"}} class="small {{if showQuickFilterConfirmed "active"}}">filter</button>
+        </nav>
       </header>
       <div class="content">
         {{contribution-list contributions=contributionsConfirmedSorted
-                            vetoContribution=(action "vetoContribution")}}
+                            vetoContribution=(action "vetoContribution")
+                            selectedContributionId=selectedContributionId
+                            showQuickFilter=showQuickFilterConfirmed}}
       </div>
     </section>
   </div>
 
+  <div id="details">
+    {{outlet}}
+  </div>
+
 </main>

app/templates/dashboard/contributions/show.hbs

@@ -0,0 +1,62 @@
+<section id="contribution-details" class={{if model.vetoed "vetoed"}}>
+  <header class="with-nav">
+    <h2>Contribution #{{model.id}}</h2>
+    <nav>
+      <span class="amount">{{model.amount}}</span>&nbsp;
+      <span class="symbol">₭S</span>
+    </nav>
+  </header>
+
+  <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}}
+      </span>
+      contributed
+      <span class="date" title={{model.iso8601Date}}>{{moment-from model.iso8601Date}}</span>:
+    </p>
+    <h3>{{model.description}}</h3>
+    <p>
+      Kind: {{model.kind}}
+      <br>Status: {{contribution-status model}}
+    </p>
+    {{#if model.url}}
+      <p>
+        <a href={{model.url}}
+           title={{model.description}}
+           class="button"
+           target="_blank"
+           rel="noopener">
+          Open URL
+        </a>
+      </p>
+    {{/if}}
+    {{#if model.vetoed}}
+      <div class="hint vetoed">
+        <div class="icon">
+          {{icon-warning}}
+        </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"}}.
+        </p>
+      </div>
+    {{/if}}
+  </div>
+
+  <div class="actions">
+    <p>
+      {{link-to "Copy & edit as new" "contributions.resubmit" model class="button small"}}.
+      {{#if model.ipfsHash}}
+        <a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}"
+           class="button small" target="_blank" rel="noopener">
+          Inspect IPFS data
+        </a>
+      {{/if}}
+    </p>
+  </div>
+</section>

app/templates/dashboard/contributors/show.hbs

@@ -0,0 +1,36 @@
+<section id="contributor-profile">
+  <header>
+    {{user-avatar contributor=model size="medium"}}
+  </header>
+
+  <div class="content">
+    <h2>{{model.name}}</h2>
+    <p class="role">{{roleName}}</p>
+
+    <ul class="external-accounts">
+      {{#each model.accounts as |account|}}
+        <li>
+          {{external-account-link account=account}}
+        </li>
+      {{/each}}
+      {{#if model.url}}
+        <li>
+          <a href={{model.url}} target="_blank" rel="noopener" title="Website">
+            <span class="site">Web</span>
+            {{icon-web-globe}}
+          </a>
+        </li>
+      {{/if}}
+    </ul>
+  </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="{{ipfsGatewayUrl}}/{{model.ipfsHash}}" class="button small" target="_blank" rel="noopener">Inspect IPFS profile</a>
+      {{/if}}
+      {{link-to "Edit profile" "contributors.edit" model class="button small"}}
+    </p>
+  </div>
+</section>

app/templates/signup.hbs

@@ -0,0 +1,5 @@
+<main class="center-column">
+  <section id="signup">
+    {{outlet}}
+  </section>
+</main>

app/templates/signup/complete.hbs

@@ -0,0 +1,15 @@
+<header>
+  <h2>Welcome aboard!</h2>
+</header>
+<div class="content text-lg text-center">
+  <p>
+    Congratulations. Your initial profile is now complete.
+  </p>
+  <p>
+    Why not say hi to your fellow contributors
+    <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}}
+  </p>
+</div>

app/templates/signup/eth-account.hbs

@@ -0,0 +1,25 @@
+<header>
+  <h2>Complete your contributor profile</h2>
+</header>
+<div class="content text-lg">
+  <p class="mg-bottom-md">
+    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"}}>
+    <p>
+      <label>
+        Ethereum account:<br>
+        {{input type="text" value=ethAddress
+                placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
+                class=(if isValidEthAccount "valid" "")}}
+      </label>
+    </p>
+  </form>
+  <p class="actions">
+    <button disabled={{signupButtonDisabled}}
+            {{action "completeSignup"}}>
+      Complete my profile
+    </button>
+  </p>
+</div>

app/templates/signup/index.hbs

@@ -0,0 +1,20 @@
+<header>
+  <h2>Create your contributor profile</h2>
+</header>
+<div class="content text-lg">
+  <p>
+    You have already contributed to a Kosmos project, or you are interested
+    in contributing in the near future? Fantastic!
+  </p>
+  <p>
+    In order to earn kredits for your contributions, you will need a
+    registered contributor profile. The quickest way to register is by
+    connecting one of the following accounts:
+  </p>
+  <p class="actions">
+    <button {{action "connectGithub"}} class="icon">
+      {{icon-account-github-com}}
+      Connect GitHub
+    </button>
+  </p>
+</div>

app/utils/cps/bignumber.js

@@ -1,5 +1,5 @@
 import { computed } from '@ember/object';
-import ethers from 'npm:ethers';
+import ethers from 'ethers';
 
 export default function(dependentKey, converterMethod) {
   return computed(dependentKey, {

app/utils/cps/kredits.js

@@ -1,5 +1,5 @@
 import { computed } from '@ember/object';
-import ethers from 'npm:ethers';
+import ethers from 'ethers';
 import formatKredits from 'kredits-web/utils/format-kredits';
 
 export default function(dependentKey, options = {}) {

app/utils/format-kredits.js

@@ -1,4 +1,4 @@
-import ethers from 'npm:ethers';
+import ethers from 'ethers';
 
 export default function(value, options = {}) {
   let etherValue = ethers.utils.formatEther(value);

config/environment.js

@@ -12,7 +12,7 @@ module.exports = function(environment) {
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
@@ -36,11 +36,16 @@ module.exports = function(environment) {
     },
 
     web3ProviderUrl: 'https://rinkeby.infura.io/v3/d4f788b7a6584f7db2fc3c268d4d09e9',
+    web3RequiredNetwork: 'rinkeby',
+
+    githubConnectUrl: 'https://hal8000.chat.kosmos.org/kredits/signup/connect/github',
+    githubSignupUrl: 'https://hal8000.chat.kosmos.org/kredits/signup/github',
 
     ipfs: {
       host: 'ipfs.kosmos.org',
       port: '5444',
-      protocol: 'https'
+      protocol: 'https',
+      gatewayUrl: 'https://ipfs.kosmos.org/ipfs'
     }
   };
 
@@ -52,10 +57,14 @@ module.exports = function(environment) {
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
     ENV.web3ProviderUrl = 'https://rinkeby.infura.io/v3/d4f788b7a6584f7db2fc3c268d4d09e9';
 
+    ENV.githubConnectUrl = 'http://localhost:8888/kredits/signup/connect/github';
+    ENV.githubSignupUrl = 'http://localhost:8888/kredits/signup/github';
+
     ENV.ipfs = {
       host: 'localhost',
       port: '5001',
-      protocol: 'http'
+      protocol: 'http',
+      gatewayUrl: 'http://localhost:8080/ipfs'
     };
   }
 
@@ -71,16 +80,12 @@ module.exports = function(environment) {
     ENV.APP.autoboot = false;
   }
 
-  if (environment === 'production') {
-    // here you can enable a production-specific feature
-    ENV.kreditsApmDomain = process.env.KREDITS_APM_DOMAIN || 'open.aragonpm.eth';
-  }
-
   if (process.env.WEB3_PROVIDER_URL) {
     ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
+    ENV.web3RequiredNetwork = null;
   }
-  if (process.env.KREDITS_KERNEL_ADDRESS) {
+  if (process.env.KREDITS_DAO_ADDRESS) {
-    ENV.kreditsKernelAddress = process.env.KREDITS_KERNEL_ADDRESS;
+    ENV.kreditsKernelAddress = process.env.KREDITS_DAO_ADDRESS;
   }
   if (process.env.KREDITS_APM_DOMAIN) {
     ENV.kreditsApmDomain = process.env.KREDITS_APM_DOMAIN;

ember-cli-build.js

@@ -12,6 +12,23 @@ module.exports = function(defaults) {
     sourcemaps: {
       enabled: true,
       extensions: ['js']
+    },
+    autoImport: {
+      webpack: {
+        module: {
+          rules: [
+            {
+              // inline json files instead of using fs.readFileSync
+              enforce: 'post',
+              test: /kosmos-schemas\/index\.js$/,
+              loader: 'transform-loader?brfs'
+            }
+          ]
+        },
+        node: {
+          path: "empty" // needed for kosmos-schemas dependency
+        }
+      }
     }
   });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-web",
-  "version": "1.1.0",
+  "version": "1.12.0",
   "private": true,
   "description": "Contribution dashboard of the Kosmos project",
   "repository": "https://github.com/67P/kredits-web",
@@ -14,54 +14,61 @@
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "test": "ember test",
-    "start": "KREDITS_APM_DOMAIN=open.aragonpm.eth ember serve",
+    "start": "ember serve",
-    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember s",
+    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember serve",
     "build": "ember build",
     "build-prod": "rm -rf release/* && ember build -prod --output-path release",
     "preversion": "npm test",
     "version": "npm run build-prod && git add release/",
+    "postversion": "git push origin master",
     "deploy": "git push 5apps master"
   },
   "devDependencies": {
-    "@ember/jquery": "^0.5.2",
+    "@ember/jquery": "^0.6.0",
-    "@ember/optional-features": "^0.6.3",
+    "@ember/optional-features": "^0.7.0",
     "babel-preset-es2015": "^6.22.0",
     "babelify": "^7.3.0",
-    "broccoli-asset-rev": "^2.7.0",
+    "brfs": "^2.0.2",
-    "ember-ajax": "^4.0.1",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-ajax": "^5.0.0",
+    "ember-auto-import": "^1.5.3",
     "ember-awesome-macros": "0.41.0",
-    "ember-browserify": "^1.1.13",
+    "ember-cli": "~3.10.1",
-    "ember-cli": "~3.8.1",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.1.2",
+    "ember-cli-babel": "^7.7.3",
     "ember-cli-chart": "^3.4.0",
     "ember-cli-dependency-checker": "^3.1.0",
-    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "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-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-uglify": "^2.1.0",
-    "ember-cli-update": "^0.21.2",
     "ember-export-application-global": "^2.0.0",
     "ember-flatpickr": "^2.14.0",
-    "ember-load-initializers": "^1.1.0",
+    "ember-load-initializers": "^2.0.0",
     "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": "^3.4.1",
+    "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.8.0",
+    "ember-source": "~3.10.0",
     "ember-truth-helpers": "github:jmurphyau/ember-truth-helpers#31a14373a31f1f82c77537720549b47a95c28e5f",
-    "eslint-plugin-ember": "^5.2.0",
+    "eslint-plugin-ember": "^6.2.0",
+    "eslint-plugin-node": "^9.0.1",
     "ethers": "^4.0.27",
     "kosmos-schemas": "^2.0.0",
-    "kredits-contracts": "^5.3.0",
+    "kredits-contracts": "^5.5.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.8.0",
+    "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3",
-    "tv4": "^1.3.0"
+    "qunit-dom": "^0.8.4",
+    "transform-loader": "^0.2.4",
+    "tv4": "^1.3.0",
+    "web3-utils": "^1.0.0"
   },
   "engines": {
     "node": "8.* || >= 10.*"

release/assets/auto-import-fastboot-81f919f3d82c38703c7b0de8c4c4a874.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"auto-import-fastboot.js"}

release/assets/auto-import-fastboot-e289ea484a4d8949ea84cb262a624452.js

@@ -0,0 +1,2 @@
+
+//# sourceMappingURL=auto-import-fastboot-81f919f3d82c38703c7b0de8c4c4a874.map

release/assets/kredits-web-4214f7a9448535607cb840171b47f23f.js

@@ -1,190 +0,0 @@
-"use strict"
-define("kredits-web/app",["exports","kredits-web/resolver","ember-load-initializers","kredits-web/config/environment"],function(e,t,n,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=Ember.Application.extend({modulePrefix:r.default.modulePrefix,podModulePrefix:r.default.podModulePrefix,Resolver:t.default});(0,n.default)(i,r.default.modulePrefix)
-var o=i
-e.default=o}),define("kredits-web/components/add-contribution/component",["exports"],function(e){function t(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=[],r=!0,i=!1,o=void 0
-try{for(var s,u=e[Symbol.iterator]();!(r=(s=u.next()).done)&&(n.push(s.value),!t||n.length!==t);r=!0);}catch(a){i=!0,o=a}finally{try{r||null==u.return||u.return()}finally{if(i)throw o}}return n}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Component.extend({attributes:null,contributors:Object.freeze([]),isValidContributor:Ember.computed.notEmpty("contributorId"),isValidKind:Ember.computed.notEmpty("kind"),isValidAmount:Ember.computed("amount",function(){return parseInt(this.amount,10)>0}),isValidDescription:Ember.computed.notEmpty("description"),isValidUrl:Ember.computed.notEmpty("url"),isValid:Ember.computed.and("isValidContributor","isValidKind","isValidAmount","isValidDescription"),init:function(){this._super.apply(this,arguments),this.set("defaultDate",new Date),this.set("attributes",{contributorId:null,kind:null,date:[new Date],amount:null,description:null,url:null}),this.reset()},reset:function(){this.setProperties(this.attributes)},actions:{submit:function(){var e=this
-if(this.isValid){var n=this.getProperties(Object.keys(this.attributes)),r=t(n.date[0].toISOString().split("T"),1)[0]
-n.date=r,this.set("inProgress",!0),this.save(n).then(function(){e.reset()},function(e){console.warn(e),window.alert("Something went wrong. Check the browser console for details.")}).finally(function(){return e.set("inProgress",!1)})}else alert("Invalid data. Please review and try again.")}}})
-e.default=n}),define("kredits-web/components/add-contribution/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"vo6G9r3I",block:'{"symbols":["contributor"],"statements":[[7,"form"],[9],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"select"],[11,"required",""],[12,"onchange",[27,"action",[[22,0,[]],[27,"mut",[[23,["contributorId"]]],null]],[["value"],["target.value"]]]],[9],[0,"\\n      "],[7,"option"],[11,"value",""],[11,"selected",""],[11,"disabled",""],[11,"hidden",""],[9],[0,"Contributor"],[10],[0,"\\n"],[4,"each",[[23,["contributors"]]],null,{"statements":[[0,"        "],[7,"option"],[12,"value",[22,1,["id"]]],[12,"selected",[27,"eq",[[23,["contributorId"]],[22,1,["id"]]],null]],[9],[1,[22,1,["github_username"]],false],[10],[0,"\\n"]],"parameters":[1]},null],[0,"    "],[10],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"select"],[11,"required",""],[12,"onchange",[27,"action",[[22,0,[]],[27,"mut",[[23,["kind"]]],null]],[["value"],["target.value"]]]],[9],[0,"\\n      "],[7,"option"],[11,"value",""],[11,"selected",""],[11,"disabled",""],[11,"hidden",""],[9],[0,"Kind"],[10],[0,"\\n      "],[7,"option"],[11,"value","community"],[12,"selected",[27,"eq",[[23,["kind"]],"community"],null]],[9],[0,"Community"],[10],[0,"\\n      "],[7,"option"],[11,"value","design"],[12,"selected",[27,"eq",[[23,["kind"]],"design"],null]],[9],[0,"Design"],[10],[0,"\\n      "],[7,"option"],[11,"value","dev"],[12,"selected",[27,"eq",[[23,["kind"]],"dev"],null]],[9],[0,"Development"],[10],[0,"\\n      "],[7,"option"],[11,"value","docs"],[12,"selected",[27,"eq",[[23,["kind"]],"docs"],null]],[9],[0,"Documentation"],[10],[0,"\\n      "],[7,"option"],[11,"value","ops"],[12,"selected",[27,"eq",[[23,["kind"]],"ops"],null]],[9],[0,"IT Operations"],[10],[0,"\\n      "],[7,"option"],[11,"value","special"],[12,"selected",[27,"eq",[[23,["kind"]],"ops"],null]],[9],[0,"Special"],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"ember-flatpickr",null,[["allowInput","altFormat","altInput","altInputClass","date","dateFormat","defaultDate","maxDate","onChange"],[false,"F j, Y",true,"date-alt",[23,["date"]],"Y-m-d",[23,["defaultDate"]],[23,["defaultDate"]],[27,"action",[[22,0,[]],[27,"mut",[[23,["date"]]],null]],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","placeholder","value","class"],["text","500",[23,["amount"]],[27,"if",[[23,["isValidAmount"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","placeholder","value","class"],["text","Description",[23,["description"]],[27,"if",[[23,["isValidDescription"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","placeholder","value","class"],["text","URL (optional)",[23,["url"]],[27,"if",[[23,["isValidUrl"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[11,"class","actions"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","disabled","value"],["submit",[23,["inProgress"]],[27,"if",[[23,["inProgress"]],"Processing","Save"],null]]]],false],[0,"\\n  "],[10],[0,"\\n"],[3,"action",[[22,0,[]],"submit"],[["on"],["submit"]]],[10],[0,"\\n\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/components/add-contribution/template.hbs"}})
-e.default=t}),define("kredits-web/components/add-contributor/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({kredits:Ember.inject.service(),attributes:null,isValidAccount:Ember.computed.notEmpty("account"),isValidName:Ember.computed.notEmpty("name"),isValidURL:Ember.computed.notEmpty("url"),isValidGithubUID:Ember.computed.notEmpty("github_uid"),isValidGithubUsername:Ember.computed.notEmpty("github_username"),isValidGiteaUsername:Ember.computed.notEmpty("gitea_username"),isValidWikiUsername:Ember.computed.notEmpty("wiki_username"),isValid:Ember.computed.and("isValidAccount","isValidName","isValidGithubUID"),inProgress:!1,init:function(){this._super.apply(this,arguments),this.setDefaultAttributes(),this.reset()},setDefaultAttributes:function(){Ember.isPresent(this.attributes)||this.set("attributes",{account:null,name:null,kind:"person",url:null,github_username:null,github_uid:null,gitea_username:null,wiki_username:null})},reset:function(){this.setProperties(this.attributes)},actions:{submit:function(){var e=this
-if(this.isValid){var t=Object.keys(this.attributes),n=this.getProperties(t)
-this.set("inProgress",!0),this.save(n).then(function(){e.reset()}).catch(function(e){console.warn(e),window.alert("Something went wrong. Please check the browser console.")}).finally(function(){e.set("inProgress",!1)})}else alert("Invalid data. Please review and try again.")}}})
-e.default=t}),define("kredits-web/components/add-contributor/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"ub+zr3DC",block:'{"symbols":[],"statements":[[7,"form"],[9],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-account"],[9],[0,"Ethereum account"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","id","type","value","placeholder","class"],["account","c-account","text",[23,["account"]],"0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4",[27,"if",[[23,["isValidAccount"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-kind"],[9],[0,"Kind"],[10],[0,"\\n    "],[7,"select"],[11,"required",""],[12,"onchange",[27,"action",[[22,0,[]],[27,"mut",[[23,["kind"]]],null]],[["value"],["target.value"]]]],[11,"id","c-kind"],[9],[0,"\\n      "],[7,"option"],[11,"value","person"],[12,"selected",[27,"eq",[[23,["kind"]],"person"],null]],[9],[0,"Person"],[10],[0,"\\n      "],[7,"option"],[11,"value","organization"],[12,"selected",[27,"eq",[[23,["kind"]],"organization"],null]],[9],[0,"Organization"],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-name"],[9],[0,"Name"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","type","value","placeholder","class","id"],["name","text",[23,["name"]],"Zero Cool",[27,"if",[[23,["isValidName"]],"valid",""],null],"c-name"]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-url"],[9],[0,"URL"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","type","value","placeholder","class","id"],["url","text",[23,["url"]],"http://zerocool.bit",[27,"if",[[23,["isValidURL"]],"valid",""],null],"c-url"]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-github-uid"],[9],[0,"GitHub UID"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","type","value","placeholder","class","id"],["github_uid","text",[23,["github_uid"]],"2342",[27,"if",[[23,["isValidGithubUID"]],"valid",""],null],"c-github-uid"]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-github-username"],[9],[0,"GitHub username"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","type","value","placeholder","class","id"],["github_username","text",[23,["github_username"]],"zerocool",[27,"if",[[23,["isValidGithubUsername"]],"valid",""],null],"c-github-username"]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-gitea-username"],[9],[0,"Gitea username"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","type","value","placeholder","class","id"],["gitea_username","text",[23,["gitea_username"]],"zerocool",[27,"if",[[23,["isValidGiteaUsername"]],"valid",""],null],"c-gitea-username"]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"label"],[11,"for","c-wiki-username"],[9],[0,"Wiki username"],[10],[0,"\\n    "],[1,[27,"input",null,[["name","type","value","placeholder","class","id"],["wiki_username","text",[23,["wiki_username"]],"ZeroCool",[27,"if",[[23,["isValidWikiUsername"]],"valid",""],null],"c-wiki-username"]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[11,"class","actions"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","disabled","value"],["submit",[23,["inProgress"]],[27,"if",[[23,["inProgress"]],"Processing","Save"],null]]]],false],[0,"\\n  "],[10],[0,"\\n"],[3,"action",[[22,0,[]],"submit"],[["on"],["submit"]]],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/components/add-contributor/template.hbs"}})
-e.default=t}),define("kredits-web/components/add-proposal/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({attributes:null,contributors:Object.freeze([]),isValidContributor:Ember.computed.notEmpty("contributorId"),isValidAmount:Ember.computed("amount",function(){return parseInt(this.amount,10)>0}),isValidDescription:Ember.computed.notEmpty("description"),isValidUrl:Ember.computed.notEmpty("url"),isValid:Ember.computed.and("isValidContributor","isValidAmount","isValidDescription"),init:function(){this._super.apply(this,arguments),this.set("attributes",{contributorId:null,kind:"community",amount:null,description:null,url:null})},didInsertElement:function(){this._super.apply(this,arguments),this.reset()},reset:function(){this.setProperties(this.attributes)},actions:{submit:function(){var e=this
-if(this.isValid){var t=Object.keys(this.attributes),n=this.getProperties(t),r=this.save(n)
-this.set("inProgress",r),r.then(function(){e.reset(),window.scroll(0,0),window.alert("Proposal added.")})}else alert("Invalid data. Please review and try again.")}}})
-e.default=t}),define("kredits-web/components/add-proposal/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"3DOgBCvD",block:'{"symbols":["contributor"],"statements":[[7,"form"],[9],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"select"],[11,"required",""],[12,"onchange",[27,"action",[[22,0,[]],[27,"mut",[[23,["contributorId"]]],null]],[["value"],["target.value"]]]],[9],[0,"\\n      "],[7,"option"],[11,"value",""],[11,"selected",""],[11,"disabled",""],[11,"hidden",""],[9],[0,"Contributor"],[10],[0,"\\n"],[4,"each",[[23,["contributors"]]],null,{"statements":[[0,"        "],[7,"option"],[12,"value",[22,1,["id"]]],[12,"selected",[27,"eq",[[23,["contributorId"]],[22,1,["id"]]],null]],[9],[1,[22,1,["github_username"]],false],[10],[0,"\\n"]],"parameters":[1]},null],[0,"    "],[10],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[7,"select"],[11,"required",""],[12,"onchange",[27,"action",[[22,0,[]],[27,"mut",[[23,["kind"]]],null]],[["value"],["target.value"]]]],[9],[0,"\\n      "],[7,"option"],[11,"value","community"],[12,"selected",[27,"eq",[[23,["kind"]],"community"],null]],[9],[0,"Community"],[10],[0,"\\n      "],[7,"option"],[11,"value","design"],[12,"selected",[27,"eq",[[23,["kind"]],"design"],null]],[9],[0,"Design"],[10],[0,"\\n      "],[7,"option"],[11,"value","dev"],[12,"selected",[27,"eq",[[23,["kind"]],"dev"],null]],[9],[0,"Development"],[10],[0,"\\n      "],[7,"option"],[11,"value","docs"],[12,"selected",[27,"eq",[[23,["kind"]],"docs"],null]],[9],[0,"Documentation"],[10],[0,"\\n      "],[7,"option"],[11,"value","ops"],[12,"selected",[27,"eq",[[23,["kind"]],"ops"],null]],[9],[0,"IT Operations"],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","placeholder","value","class"],["text","100",[23,["amount"]],[27,"if",[[23,["isValidAmount"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","placeholder","value","class"],["text","Description",[23,["description"]],[27,"if",[[23,["isValidDescription"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","placeholder","value","class"],["text","URL (optional)",[23,["url"]],[27,"if",[[23,["isValidUrl"]],"valid",""],null]]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"p"],[11,"class","actions"],[9],[0,"\\n    "],[1,[27,"input",null,[["type","disabled","value"],["submit",[27,"is-pending",[[23,["inProgress"]]],null],[27,"if",[[27,"is-pending",[[23,["inProgress"]]],null],"Processing","Save"],null]]]],false],[0,"\\n    "],[4,"link-to",["index"],null,{"statements":[[0,"Back"]],"parameters":[]},null],[0,"\\n  "],[10],[0,"\\n"],[3,"action",[[22,0,[]],"submit"],[["on"],["submit"]]],[10],[0,"\\n\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/components/add-proposal/template.hbs"}})
-e.default=t}),define("kredits-web/components/chart-contributions-by-type/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t="#fb6868",n="#fbe468",r="#e068fb",i="#97fb68",o="#8f68fb",s=Ember.Component.extend({contributions:null,chartOptions:Object.freeze({legend:{display:!1}}),chartData:Ember.computed("contributions",function(){var e=this.contributions.filterBy("vetoed",!1).map(function(e){return{kind:e.kind,amount:e.amount}}).reduce(function(e,t){return t.kind in e?e[t.kind]=e[t.kind]+t.amount:e[t.kind]=t.amount,e},{})
-return{datasets:[{data:[e.community,e.design,e.dev,e.ops,e.docs],borderColor:[t,n,r,o,i],borderWidth:1}],labels:["Community","Design","Development","Operations & Infrastructure","Documentation"]}})})
-e.default=s}),define("kredits-web/components/chart-contributions-by-type/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"knNRD8x3",block:'{"symbols":[],"statements":[[7,"div"],[11,"class","chart"],[9],[0,"\\n  "],[1,[27,"ember-chart",null,[["type","data","options","width","height"],["doughnut",[23,["chartData"]],[23,["chartOptions"]],200,200]]],false],[0,"\\n"],[10]],"hasEval":false}',meta:{moduleName:"kredits-web/components/chart-contributions-by-type/template.hbs"}})
-e.default=t}),define("kredits-web/components/contribution-list/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({tagName:"ul",classNames:["contribution-list"],actions:{veto:function(e){this.contractInteractionEnabled?this.vetoContribution(e):window.alert("Only members can veto contributions. Please ask someone to set you up.")}}})
-e.default=t}),define("kredits-web/components/contribution-list/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"xYW3ZUYB",block:'{"symbols":["contribution"],"statements":[[4,"each",[[23,["contributions"]]],null,{"statements":[[0,"  "],[7,"li"],[12,"data-contribution-id",[22,1,["id"]]],[12,"class",[28,[[27,"contribution-status",[[22,1,[]]],null]," ",[27,"if",[[22,1,["vetoed"]],"vetoed"],null]]]],[9],[0,"\\n    "],[7,"p"],[11,"class","meta"],[9],[0,"\\n      "],[7,"span"],[11,"class","recipient"],[9],[1,[27,"user-avatar",null,[["contributor"],[[22,1,["contributor"]]]]],false],[10],[0,"\\n      "],[7,"span"],[12,"class",[28,["category ",[22,1,["kind"]]]]],[9],[0,"("],[1,[22,1,["kind"]],false],[0,")"],[10],[0,"\\n      "],[7,"span"],[11,"class","title"],[9],[0,"\\n"],[4,"if",[[22,1,["url"]]],null,{"statements":[[0,"          "],[7,"a"],[12,"href",[22,1,["url"]]],[11,"target","_blank"],[11,"rel","noopener"],[9],[1,[22,1,["description"]],false],[10],[0,"\\n"]],"parameters":[]},{"statements":[[0,"          "],[1,[22,1,["description"]],false],[0,"\\n"]],"parameters":[]}],[0,"      "],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"p"],[11,"class","kredits-amount"],[9],[0,"\\n      "],[7,"span"],[11,"class","amount"],[9],[1,[22,1,["amount"]],false],[10],[7,"span"],[11,"class","symbol"],[9],[0,"₭S"],[10],[0,"\\n    "],[10],[0,"\\n"],[4,"unless",[[22,1,["vetoed"]]],null,{"statements":[[4,"unless",[[27,"is-confirmed-contribution",[[22,1,[]]],null]],null,{"statements":[[0,"        "],[7,"p"],[11,"class","voting"],[9],[0,"\\n          "],[7,"button"],[11,"class","small danger"],[9],[0,"veto"],[3,"action",[[22,0,[]],"veto",[22,1,["id"]]]],[10],[0,"\\n        "],[10],[0,"\\n"]],"parameters":[]},null]],"parameters":[]},null],[0,"  "],[10],[0,"\\n"]],"parameters":[1]},null]],"hasEval":false}',meta:{moduleName:"kredits-web/components/contribution-list/template.hbs"}})
-e.default=t}),define("kredits-web/components/contributor-list/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({tagName:"table",classNames:"contributor-list",selectedContributor:null,actions:{toggleContributorInfo:function(e){e.showMetadata?e.set("showMetadata",!1):(this.contributorList.setEach("showMetadata",!1),e.set("showMetadata",!0))}}})
-e.default=t}),define("kredits-web/components/contributor-list/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"1on37xaL",block:'{"symbols":["c"],"statements":[[7,"tbody"],[9],[0,"\\n"],[4,"each",[[23,["contributorList"]]],null,{"statements":[[0,"    "],[7,"tr"],[11,"role","button"],[12,"class",[27,"if",[[27,"is-current-user",[[22,1,["contributor"]]],null],"current-user"],null]],[9],[0,"\\n      "],[7,"td"],[11,"class","person"],[9],[0,"\\n        "],[1,[27,"user-avatar",null,[["contributor"],[[22,1,["contributor"]]]]],false],[0," "],[1,[22,1,["contributor","name"]],false],[0,"\\n      "],[10],[0,"\\n      "],[7,"td"],[11,"class","kredits"],[9],[0,"\\n        "],[7,"span"],[11,"class","amount"],[9],[0,"\\n"],[4,"if",[[23,["showUnconfirmedKredits"]]],null,{"statements":[[0,"            "],[1,[22,1,["amountTotal"]],false],[0,"\\n"]],"parameters":[]},{"statements":[[0,"            "],[1,[22,1,["amountConfirmed"]],false],[0,"\\n"]],"parameters":[]}],[0,"        "],[10],[0,"\\n        "],[7,"span"],[11,"class","symbol"],[9],[0,"₭S"],[10],[0,"\\n      "],[10],[0,"\\n    "],[3,"action",[[22,0,[]],"toggleContributorInfo",[22,1,[]]]],[10],[0,"\\n    "],[7,"tr"],[12,"class",[28,["metadata ",[27,"if",[[27,"is-current-user",[[22,1,["contributor"]]],null],"current-user"],null]," ",[27,"if",[[22,1,["showMetadata"]],"visible"],null]]]],[9],[0,"\\n      "],[7,"td"],[11,"colspan","2"],[9],[0,"\\n        "],[7,"ul"],[9],[0,"\\n          "],[7,"li"],[9],[0,"\\n            "],[7,"a"],[12,"href",[28,["https://rinkeby.etherscan.io/address/",[22,1,["contributor","account"]]]]],[11,"target","_blank"],[11,"rel","noopener"],[9],[0,"Inspect Ethereum transactions"],[10],[0,"\\n          "],[10],[0,"\\n"],[4,"if",[[22,1,["contributor","ipfsHash"]]],null,{"statements":[[0,"            "],[7,"li"],[9],[0,"\\n              "],[7,"a"],[12,"href",[28,["https://ipfs.io/ipfs/",[22,1,["contributor","ipfsHash"]]]]],[11,"target","_blank"],[11,"rel","noopener"],[9],[0,"Inspect IPFS profile"],[10],[0,"\\n            "],[10],[0,"\\n"]],"parameters":[]},null],[0,"          "],[7,"li"],[9],[0,"\\n            "],[4,"link-to",["contributors.edit",[22,1,["contributor","id"]]],null,{"statements":[[0,"Edit profile"]],"parameters":[]},null],[0,"\\n          "],[10],[0,"\\n        "],[10],[0,"\\n"],[4,"if",[[22,1,["showMetadata"]]],null,{"statements":[[0,"          "],[7,"pre"],[9],[1,[22,1,["contributor","ipfsData"]],false],[10],[0,""]],"parameters":[]},null],[0,"      "],[10],[0,"\\n    "],[10],[0,"\\n"]],"parameters":[1]},null],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/components/contributor-list/template.hbs"}})
-e.default=t}),define("kredits-web/components/ember-chart",["exports","ember-cli-chart/components/ember-chart"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n}),define("kredits-web/components/ember-flatpickr",["exports","ember-flatpickr/components/ember-flatpickr"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}),define("kredits-web/components/loading-spinner/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({classNames:["loading-spinner"]})
-e.default=t}),define("kredits-web/components/loading-spinner/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"b6SWTOaj",block:'{"symbols":[],"statements":[[7,"p"],[9],[0,"\\n  "],[7,"svg"],[11,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[11,"xmlns:xlink","http://www.w3.org/1999/xlink","http://www.w3.org/2000/xmlns/"],[11,"version","1.1"],[11,"x","0px"],[11,"y","0px"],[11,"viewBox","0 0 132 100"],[11,"enable-background","new 0 0 100 100"],[11,"xml:space","preserve","http://www.w3.org/XML/1998/namespace"],[9],[0,"\\n    "],[7,"path"],[11,"id","path-comet"],[11,"d","M79.062,24.173L79.062,24.173l-0.021-0.011c-0.068-0.03-0.137-0.062-0.204-0.093L42.392,7.337\\n             c0,0,3.065,14.104,4.458,18.019l0,0c0,0-41.754-12.481-46.85-13.67c1.67,6.52,30.607,62.492,30.607,62.492\\n             c5.848,11.873,19.394,18.485,33.522,18.485c19.811,0,35.87-16.059,35.87-35.869C100,42.313,91.418,29.837,79.062,24.173z"],[9],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n"],[10],[0,"\\n"],[7,"p"],[9],[0,"\\n  Loading data...\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/components/loading-spinner/template.hbs"}})
-e.default=t}),define("kredits-web/components/proposal-list/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({tagName:"ul",classNames:["proposal-list"],actions:{confirm:function(e){this.contractInteractionEnabled?this.confirmProposal(e):window.alert("Only members can vote on proposals. Please ask someone to set you up.")}}})
-e.default=t}),define("kredits-web/components/proposal-list/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"pZHMSOZc",block:'{"symbols":["proposal"],"statements":[[4,"each",[[23,["proposals"]]],null,{"statements":[[0,"  "],[7,"li"],[12,"data-proposal-id",[22,1,["id"]]],[12,"class",[27,"if",[[22,1,["isExecuted"]],"confirmed","unconfirmed"],null]],[9],[0,"\\n    "],[7,"p"],[11,"class","meta"],[9],[0,"\\n      "],[7,"span"],[12,"class",[28,["category ",[22,1,["kind"]]]]],[9],[0,"♥ ("],[1,[22,1,["kind"]],false],[0,")"],[10],[0,"\\n      "],[7,"span"],[11,"class","recipient"],[9],[1,[22,1,["contributor","name"]],false],[0,":"],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"p"],[11,"class","kredits-amount"],[9],[0,"\\n      "],[7,"span"],[11,"class","amount"],[9],[1,[22,1,["amount"]],false],[10],[7,"span"],[11,"class","symbol"],[9],[0,"₭S"],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"p"],[11,"class","description"],[9],[0,"\\n      "],[7,"span"],[11,"class","description"],[9],[1,[22,1,["description"]],false],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"p"],[11,"class","voting"],[9],[0,"\\n"],[4,"unless",[[22,1,["isExecuted"]]],null,{"statements":[[0,"        "],[7,"span"],[11,"class","votes"],[9],[0,"("],[1,[22,1,["votesCount"]],false],[0,"/"],[1,[22,1,["votesNeeded"]],false],[0," votes)"],[10],[0,"\\n        "],[7,"button"],[9],[0,"+1"],[3,"action",[[22,0,[]],"confirm",[22,1,["id"]]]],[10],[0,"\\n"]],"parameters":[]},null],[0,"    "],[10],[0,"\\n  "],[10],[0,"\\n"]],"parameters":[1]},null]],"hasEval":false}',meta:{moduleName:"kredits-web/components/proposal-list/template.hbs"}})
-e.default=t}),define("kredits-web/components/user-avatar/component",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Component.extend({contributor:null,tagName:"img",classNames:["avatar"],attributeBindings:["src","title"],src:Ember.computed.alias("contributor.avatarURL"),title:Ember.computed.alias("contributor.name")})
-e.default=t}),define("kredits-web/components/user-avatar/template",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"rnnAjEgP",block:'{"symbols":[],"statements":[],"hasEval":false}',meta:{moduleName:"kredits-web/components/user-avatar/template.hbs"}})
-e.default=t}),define("kredits-web/controllers/application",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Controller.extend({kredits:Ember.inject.service()})
-e.default=t}),define("kredits-web/controllers/contributions/new",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Controller.extend({kredits:Ember.inject.service(),contributors:Ember.computed.alias("kredits.contributors"),minedContributors:Ember.computed.filterBy("contributors","id"),contributorsSorting:Object.freeze(["name:asc"]),sortedContributors:Ember.computed.sort("minedContributors","contributorsSorting"),actions:{save:function(e){var t=this,n=this.contributors.findBy("id",e.contributorId)
-return e.contributorIpfsHash=n.ipfsHash,this.kredits.addContribution(e).then(function(e){return t.transitionToRoute("index"),e})}}})
-e.default=t}),define("kredits-web/controllers/contributors/edit",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Controller.extend({kredits:Ember.inject.service(),actions:{save:function(e){var t=this
-return this.kredits.updateContributor(this.model.id,e).then(function(){return t.transitionToRoute("index")})}}})
-e.default=t}),define("kredits-web/controllers/contributors/new",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Controller.extend({kredits:Ember.inject.service(),actions:{save:function(e){var t=this
-return this.kredits.addContributor(e).then(function(){return t.transitionToRoute("index")})}}})
-e.default=t}),define("kredits-web/controllers/index",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Controller.extend({kredits:Ember.inject.service(),currentBlock:Ember.computed.alias("kredits.currentBlock"),contributions:Ember.computed.alias("kredits.contributions"),contributionsConfirmed:Ember.computed.alias("kredits.contributionsConfirmed"),contributionsUnconfirmed:Ember.computed.alias("kredits.contributionsUnconfirmed"),contributionsSorting:Object.freeze(["id:desc"]),contributionsUnconfirmedSorted:Ember.computed.sort("contributionsUnconfirmed","contributionsSorting"),contributionsConfirmedSorted:Ember.computed.sort("contributionsConfirmed","contributionsSorting"),kreditsByContributor:Ember.computed.alias("kredits.kreditsByContributor"),kreditsToplistSorting:Ember.computed("showUnconfirmedKredits",function(){return this.showUnconfirmedKredits?["amountTotal:desc"]:["amountConfirmed:desc"]}),kreditsToplist:Ember.computed.sort("kreditsByContributor","kreditsToplistSorting"),showUnconfirmedKredits:!0,hideUnconfirmedKredits:Ember.computed.not("showUnconfirmedKredits"),actions:{vetoContribution:function(e){this.kredits.veto(e).then(function(e){console.debug("[controllers:index] Veto submitted to Ethereum blockhain: "+e.hash)})},confirmProposal:function(e){this.kredits.vote(e).then(function(e){console.debug("[controllers:index] Vote submitted to Ethereum blockhain: "+e.hash)})}}})
-e.default=t}),define("kredits-web/controllers/proposals/new",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Controller.extend({kredits:Ember.inject.service(),contributors:Ember.computed.alias("kredits.contributors"),minedContributors:Ember.computed.filterBy("contributors","id"),actions:{save:function(e){var t=this,n=this.contributors.findBy("id",e.contributorId)
-return e.contributorIpfsHash=n.get("ipfsHash"),this.kredits.addProposal(e).then(function(e){return t.transitionToRoute("index"),e})}}})
-e.default=t}),define("kredits-web/helpers/and",["exports","ember-truth-helpers/helpers/and"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"and",{enumerable:!0,get:function(){return t.and}})}),define("kredits-web/helpers/app-version",["exports","kredits-web/config/environment","ember-cli-app-version/utils/regexp"],function(e,t,n){function r(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=t.default.APP.version,o=r.versionOnly||r.hideSha,s=r.shaOnly||r.hideVersion,u=null
-return o&&(r.showExtended&&(u=i.match(n.versionExtendedRegExp)),u||(u=i.match(n.versionRegExp))),s&&(u=i.match(n.shaRegExp)),u?u[0]:i}Object.defineProperty(e,"__esModule",{value:!0}),e.appVersion=r,e.default=void 0
-var i=Ember.Helper.helper(r)
-e.default=i}),define("kredits-web/helpers/await",["exports","ember-promise-helpers/helpers/await"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})
-define("kredits-web/helpers/contribution-status",["exports"],function(e){function t(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=[],r=!0,i=!1,o=void 0
-try{for(var s,u=e[Symbol.iterator]();!(r=(s=u.next()).done)&&(n.push(s.value),!t||n.length!==t);r=!0);}catch(a){i=!0,o=a}finally{try{r||null==u.return||u.return()}finally{if(i)throw o}}return n}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Helper.extend({kredits:Ember.inject.service(),currentBlock:Ember.computed.alias("kredits.currentBlock"),compute:function(e){var n=t(e,1)[0]
-return n.vetoed?"vetoed":n.confirmedAt>this.currentBlock?"unconfirmed":"confirmed"}})
-e.default=n}),define("kredits-web/helpers/eq",["exports","ember-truth-helpers/helpers/equal"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"equal",{enumerable:!0,get:function(){return t.equal}})}),define("kredits-web/helpers/gt",["exports","ember-truth-helpers/helpers/gt"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gt",{enumerable:!0,get:function(){return t.gt}})}),define("kredits-web/helpers/gte",["exports","ember-truth-helpers/helpers/gte"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gte",{enumerable:!0,get:function(){return t.gte}})}),define("kredits-web/helpers/is-array",["exports","ember-truth-helpers/helpers/is-array"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isArray",{enumerable:!0,get:function(){return t.isArray}})}),define("kredits-web/helpers/is-confirmed-contribution",["exports"],function(e){function t(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=[],r=!0,i=!1,o=void 0
-try{for(var s,u=e[Symbol.iterator]();!(r=(s=u.next()).done)&&(n.push(s.value),!t||n.length!==t);r=!0);}catch(a){i=!0,o=a}finally{try{r||null==u.return||u.return()}finally{if(i)throw o}}return n}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Helper.extend({kredits:Ember.inject.service(),currentBlock:Ember.computed.alias("kredits.currentBlock"),compute:function(e){var n=t(e,1)[0]
-return!n.vetoed&&n.confirmedAt<=this.currentBlock}})
-e.default=n}),define("kredits-web/helpers/is-current-user",["exports"],function(e){function t(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=[],r=!0,i=!1,o=void 0
-try{for(var s,u=e[Symbol.iterator]();!(r=(s=u.next()).done)&&(n.push(s.value),!t||n.length!==t);r=!0);}catch(a){i=!0,o=a}finally{try{r||null==u.return||u.return()}finally{if(i)throw o}}return n}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Helper.extend({kredits:Ember.inject.service(),currentUser:Ember.computed.alias("kredits.currentUser"),compute:function(e){var n=t(e,1)[0]
-return Ember.isPresent(n)&&Ember.isPresent(this.currentUser)&&n.account===this.currentUser.account}})
-e.default=n}),define("kredits-web/helpers/is-equal",["exports","ember-truth-helpers/helpers/is-equal"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isEqual",{enumerable:!0,get:function(){return t.isEqual}})}),define("kredits-web/helpers/is-fulfilled",["exports","ember-promise-helpers/helpers/is-fulfilled"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isFulfilled",{enumerable:!0,get:function(){return t.isFulfilled}})}),define("kredits-web/helpers/is-pending",["exports","ember-promise-helpers/helpers/is-pending"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isPending",{enumerable:!0,get:function(){return t.isPending}})}),define("kredits-web/helpers/is-rejected",["exports","ember-promise-helpers/helpers/is-rejected"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isRejected",{enumerable:!0,get:function(){return t.isRejected}})}),define("kredits-web/helpers/lt",["exports","ember-truth-helpers/helpers/lt"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lt",{enumerable:!0,get:function(){return t.lt}})}),define("kredits-web/helpers/lte",["exports","ember-truth-helpers/helpers/lte"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lte",{enumerable:!0,get:function(){return t.lte}})}),define("kredits-web/helpers/not-eq",["exports","ember-truth-helpers/helpers/not-equal"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"notEq",{enumerable:!0,get:function(){return t.notEq}})}),define("kredits-web/helpers/not",["exports","ember-truth-helpers/helpers/not"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"not",{enumerable:!0,get:function(){return t.not}})}),define("kredits-web/helpers/or",["exports","ember-truth-helpers/helpers/or"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"or",{enumerable:!0,get:function(){return t.or}})}),define("kredits-web/helpers/promise-all",["exports","ember-promise-helpers/helpers/promise-all"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"promiseAll",{enumerable:!0,get:function(){return t.promiseAll}})}),define("kredits-web/helpers/promise-hash",["exports","ember-promise-helpers/helpers/promise-hash"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"promiseHash",{enumerable:!0,get:function(){return t.promiseHash}})}),define("kredits-web/helpers/promise-rejected-reason",["exports","ember-promise-helpers/helpers/promise-rejected-reason"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}),define("kredits-web/helpers/xor",["exports","ember-truth-helpers/helpers/xor"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"xor",{enumerable:!0,get:function(){return t.xor}})}),define("kredits-web/initializers/app-version",["exports","ember-cli-app-version/initializer-factory","kredits-web/config/environment"],function(e,t,n){var r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n.default.APP&&(r=n.default.APP.name,i=n.default.APP.version)
-var o={name:"App Version",initialize:(0,t.default)(r,i)}
-e.default=o}),define("kredits-web/initializers/container-debug-adapter",["exports","ember-resolver/resolvers/classic/container-debug-adapter"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={name:"container-debug-adapter",initialize:function(){var e=arguments[1]||arguments[0]
-e.register("container-debug-adapter:main",t.default),e.inject("container-debug-adapter:main","namespace","application:main")}}
-e.default=n}),define("kredits-web/initializers/export-application-global",["exports","kredits-web/config/environment"],function(e,t){function n(){var e=arguments[1]||arguments[0]
-if(!1!==t.default.exportApplicationGlobal){var n
-if("undefined"!=typeof window)n=window
-else if("undefined"!=typeof global)n=global
-else{if("undefined"==typeof self)return
-n=self}var r,i=t.default.exportApplicationGlobal
-r="string"==typeof i?i:Ember.String.classify(t.default.modulePrefix),n[r]||(n[r]=e,e.reopen({willDestroy:function(){this._super.apply(this,arguments),delete n[r]}}))}}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=n,e.default=void 0
-var r={name:"export-application-global",initialize:n}
-e.default=r}),define("kredits-web/models/contribution",["exports","kredits-web/utils/cps/bignumber"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Object.extend({id:null,contributorId:null,amount:null,confirmedAt:(0,t.default)("confirmedAtBlock","toNumber"),vetoed:null,ipfsHash:null,creatorAccount:null,kind:null,description:null,details:null,url:null,ipfsData:"",init:function(){this._super.apply(this,arguments),this.set("details",{})}})
-e.default=n}),define("kredits-web/models/contributor",["exports","kredits-web/utils/cps/bignumber","kredits-web/utils/cps/kredits"],function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=Ember.Object.extend({id:(0,t.default)("idRaw","toString"),account:null,balance:(0,n.default)("balanceRaw"),totalKreditsEarned:(0,t.default)("totalKreditsEarnedRaw","toNumber"),contributionsCount:(0,t.default)("contributionsCountRaw","toNumber"),isCore:!1,ipfsHash:null,kind:null,name:null,url:null,github_username:null,github_uid:null,wiki_username:null,ipfsData:"",avatarURL:Ember.computed("github_uid",function(){var e=this.github_uid
-if(e)return"https://avatars2.githubusercontent.com/u/".concat(e,"?v=3&s=128")})})
-e.default=r}),define("kredits-web/models/proposal",["exports","kredits-web/utils/cps/bignumber"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Object.extend({id:(0,t.default)("idRaw","toString"),creatorAccount:null,contributorId:(0,t.default)("contributorIdRaw","toString"),amount:(0,t.default)("amountRaw","toNumber"),votesCount:(0,t.default)("votesCountRaw","toNumber"),votesNeeded:(0,t.default)("votesNeededRaw","toNumber"),executed:null,ipfsHash:null,isExecuted:Ember.computed.alias("executed"),kind:null,description:null,details:null,url:null,ipfsData:"",init:function(){this._super.apply(this,arguments),this.set("details",{})}})
-e.default=n}),define("kredits-web/resolver",["exports","ember-resolver"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n}),define("kredits-web/router",["exports","kredits-web/config/environment"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Ember.Router.extend({location:t.default.locationType,rootURL:t.default.rootURL})
-n.map(function(){this.route("proposals",function(){this.route("new")}),this.route("contributions",function(){this.route("new")}),this.route("contributors",function(){this.route("new"),this.route("edit",{path:":id/edit"})})})
-var r=n
-e.default=r}),define("kredits-web/routes/application",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Route.extend({kredits:Ember.inject.service(),beforeModel:function(e){var t=this.kredits
-return t.setup().then(function(){t.get("kredits").preflightChecks().catch(function(e){console.error("Kredits preflight check failed!"),console.error(e)}),t.get("accountNeedsUnlock")&&confirm("It looks like you have an Ethereum wallet available. Please unlock your account.")&&e.retry()}).catch(function(e){console.log("Error initializing Kredits",e)})},afterModel:function(){var e=this
-return this.kredits.loadInitialData().then(function(){e.kredits.addContractEventHandlers()})}})
-e.default=t}),define("kredits-web/routes/contributors/edit",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.Route.extend({kredits:Ember.inject.service(),contributors:Ember.computed.alias("kredits.contributors"),model:function(e){return this.kredits.contributors.findBy("id",e.id)},setupController:function(e,t){this._super(e,t),e.set("attributes",{account:t.account,name:t.name,kind:t.kind,url:t.url,github_username:t.github_username,github_uid:t.github_uid,gitea_username:t.gitea_username,wiki_username:t.wiki_username})}})
-e.default=t})
-define("kredits-web/services/ajax",["exports","ember-ajax/services/ajax"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}),define("kredits-web/services/kredits",["exports","npm:ethers","npm:kredits-contracts","kredits-web/utils/group-by","kredits-web/utils/format-kredits","kredits-web/config/environment","kredits-web/models/contributor","kredits-web/models/proposal","kredits-web/models/contribution"],function(e,t,n,r,i,o,s,u,a){function l(e,t,n,r,i,o,s){try{var u=e[o](s),a=u.value}catch(l){return void n(l)}u.done?t(a):Promise.resolve(a).then(r,i)}function d(e){return function(){var t=this,n=arguments
-return new Promise(function(r,i){var o=e.apply(t,n)
-function s(e){l(o,r,i,s,u,"next",e)}function u(e){l(o,r,i,s,u,"throw",e)}s(void 0)})}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var c=Ember.Service.extend({currentBlock:null,currentUserAccounts:null,currentUser:null,contributors:null,contributions:null,proposals:null,currentUserIsContributor:Ember.computed.notEmpty("currentUser"),currentUserIsCore:Ember.computed.alias("currentUser.isCore"),hasAccounts:Ember.computed.notEmpty("currentUserAccounts"),accountNeedsUnlock:Ember.computed("currentUserAccounts",function(){return this.currentUserAccounts&&Ember.isEmpty(this.currentUserAccounts)}),contributionsUnconfirmed:Ember.computed("contributions.[]","currentBlock",function(){var e=this
-return this.contributions.filter(function(t){return t.confirmedAt>e.currentBlock})}),contributionsConfirmed:Ember.computed("contributions.[]","currentBlock",function(){var e=this
-return this.contributions.filterBy("vetoed",!1).filter(function(t){return t.confirmedAt<=e.currentBlock})}),kreditsByContributor:Ember.computed("contributionsUnconfirmed.@each.vetoed","contributors.[]",function(){var e=this,t=this.contributionsUnconfirmed.filterBy("vetoed",!1),n=(0,r.default)(t,"contributorId"),i=n.map(function(e){return e.value.toString()}),o=this.contributors.reject(function(e){return i.includes(e.id)}),s=n.map(function(t){var n=t.items.mapBy("amount").reduce(function(e,t){return e+t}),r=e.contributors.findBy("id",t.value.toString())
-return Ember.Object.create({contributor:r,amountUnconfirmed:n,amountConfirmed:r.totalKreditsEarned,amountTotal:r.totalKreditsEarned+n})})
-return o.forEach(function(e){s.push(Ember.Object.create({contributor:e,amountUnconfirmed:0,amountConfirmed:e.totalKreditsEarned,amountTotal:e.totalKreditsEarned}))}),s}),init:function(){this._super.apply(this,arguments),this.set("contributors",[]),this.set("proposals",[]),this.set("contributions",[])},getEthProvider:function(){var e,n=this
-return new Ember.RSVP.Promise(function(){var r=d(regeneratorRuntime.mark(function r(i){var s,u,a
-return regeneratorRuntime.wrap(function(r){for(;;)switch(r.prev=r.next){case 0:if(a=function(){return(a=d(regeneratorRuntime.mark(function n(r,o){return regeneratorRuntime.wrap(function(n){for(;;)switch(n.prev=n.next){case 0:console.debug("[kredits] Using user-provided instance, e.g. from Mist browser or Metamask"),(e=new t.default.providers.Web3Provider(r)).listAccounts().then(function(t){o.set("currentUserAccounts",t)
-var n=0===t.length?null:e.getSigner()
-i({ethProvider:e,ethSigner:n})})
-case 3:case"end":return n.stop()}},n)}))).apply(this,arguments)},u=function(e,t){return a.apply(this,arguments)},s=function(){console.debug("[kredits] Creating new instance from npm module class"),console.debug("[kredits] providerURL: ".concat(o.default.web3ProviderUrl)),e=new t.default.providers.JsonRpcProvider(o.default.web3ProviderUrl),i({ethProvider:e,ethSigner:null})},!window.ethereum){r.next=15
-break}return r.prev=4,r.next=7,window.ethereum.enable()
-case 7:u(window.ethereum,n),r.next=13
-break
-case 10:r.prev=10,r.t0=r.catch(4),s()
-case 13:r.next=16
-break
-case 15:window.web3?u(window.web3.currentProvider,n):s()
-case 16:case"end":return r.stop()}},r,null,[[4,10]])}))
-return function(e){return r.apply(this,arguments)}}())},setup:function(){var e=this
-return this.getEthProvider().then(function(t){return new n.default(t.ethProvider,t.ethSigner,{addresses:{Kernel:o.default.kreditsKernelAddress},apm:o.default.kreditsApmDomain,ipfsConfig:o.default.ipfs}).init().then(function(){var t=d(regeneratorRuntime.mark(function t(n){return regeneratorRuntime.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return e.set("kredits",n),t.t0=e,t.next=4,n.provider.getBlockNumber()
-case 4:return t.t1=t.sent,t.t0.set.call(t.t0,"currentBlock",t.t1),e.currentUserAccounts&&e.currentUserAccounts.length>0&&e.getCurrentUser.then(function(t){e.set("currentUser",t)}),t.abrupt("return",n)
-case 8:case"end":return t.stop()}},t)}))
-return function(e){return t.apply(this,arguments)}}())})},totalSupply:Ember.computed(function(){return this.kredits.Token.functions.totalSupply().then(function(e){return(0,i.default)(e)})}),totalKreditsEarned:Ember.computed(function(){return this.kredits.Contribution.functions.totalKreditsEarned(!0).then(function(e){return e.toNumber()})}),loadInitialData:function(){var e=this
-return this.getContributors().then(function(t){return e.contributors.pushObjects(t)}).then(function(){return e.getContributions()}).then(function(t){return e.contributions.pushObjects(t)})},addContributor:function(e){if(e.github_uid){var t=parseInt(e.github_uid)
-e.github_uid=t}return console.debug("[kredits] add contributor",e),this.kredits.Contributor.add(e,{gasLimit:35e4}).then(function(e){console.debug("[kredits] add contributor response",e)})},updateContributor:function(e,t){if(t.github_uid){var n=parseInt(t.github_uid)
-t.github_uid=n}return console.debug("[kredits] update contributor",t),this.kredits.Contributor.updateProfile(e,t,{gasLimit:35e4}).then(function(e){console.debug("[kredits] updateProfile response",e)})},getContributors:function(){return this.kredits.Contributor.all().then(function(e){return e.map(function(e){return s.default.create(e)})})},addContribution:function(e){var t=this
-return console.debug("[kredits] add contribution",e),this.kredits.Contribution.addContribution(e,{gasLimit:3e5}).then(function(n){console.debug("[kredits] add contribution response",n),e.contributor=t.contributors.findBy("id",e.contributorId)
-var r=a.default.create(e)
-return r.set("confirmedAtBlock",n.blockNumber+40320),t.contributions.pushObject(r),r})},addProposal:function(e){var t=this
-return console.debug("[kredits] add proposal",e),this.kredits.Proposal.addProposal(e).then(function(n){return console.debug("[kredits] add proposal response",n),e.contributor=t.contributors.findBy("id",e.contributorId),u.default.create(e)})},getProposals:function(){var e=this
-return this.kredits.Proposal.all().then(function(t){return t.map(function(t){return t.contributor=e.contributors.findBy("id",t.contributorId.toString()),u.default.create(t)})})},getContributions:function(){var e=this
-return this.kredits.Contribution.all({page:{size:200}}).then(function(t){return t.map(function(t){return t.contributor=e.contributors.findBy("id",t.contributorId.toString()),a.default.create(t)})})},vote:function(e){return console.debug("[kredits] vote for",e),this.kredits.Proposal.functions.vote(e).then(function(e){return console.debug("[kredits] vote response",e),e})},veto:function(e){return console.debug("[kredits] veto against",e),this.kredits.Contribution.functions.veto(e,{gasLimit:3e5}).then(function(e){return console.debug("[kredits] veto response",e),e})},getCurrentUser:Ember.computed("kredits.provider",function(){var e=this
-return Ember.isEmpty(this.currentUserAccounts)?Ember.RSVP.resolve():this.kredits.Contributor.functions.getContributorIdByAddress(this.get("currentUserAccounts.firstObject")).then(function(t){return 0===t?Ember.RSVP.resolve():e.kredits.Contributor.getById(t)})}),findProposalById:function(e){return this.proposals.findBy("id",e.toString())},addContractEventHandlers:function(){this.kredits.Contributor.on("ContributorProfileUpdated",this.handleContributorChange.bind(this)).on("ContributorAccountUpdated",this.handleContributorChange.bind(this)).on("ContributorAdded",this.handleContributorChange.bind(this)),this.kredits.Contribution.on("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))},handleContributorChange:function(){var e=d(regeneratorRuntime.mark(function e(t){var n,r,i,o,u,a,l=arguments
-return regeneratorRuntime.wrap(function(e){for(;;)switch(e.prev=e.next){case 0:for(console.debug("[kredits] Contributor add/update event received for ID",t),n=l.length,r=new Array(n>1?n-1:0),i=1;i<n;i++)r[i-1]=l[i]
-return console.debug("[kredits] Event data:",r),e.next=5,this.kredits.Contributor.getById(t)
-case 5:o=e.sent,u=s.default.create(o),(a=this.contributors.findBy("id",t.toString()))&&(console.debug("[kredits] old contributor",a),this.contributors.removeObject(a)),console.debug("[kredits] new contributor",u),this.contributors.pushObject(u)
-case 11:case"end":return e.stop()}},e,this)}))
-return function(t){return e.apply(this,arguments)}}(),handleContributionVetoed:function(e){console.debug("[kredits] ContributionVetoed event received for ",e)
-var t=this.contributions.findBy("id",e)
-console.debug("[kredits] contribution",t),t&&t.set("vetoed",!0)},handleProposalCreated:function(e){var t=this
-this.findProposalById(e)?console.debug("[events] proposal exists, not adding from event"):this.kredits.Proposal.getById(e).then(function(e){e.contributor=t.contributors.findBy("id",e.contributorId.toString()),t.proposals.pushObject(u.default.create(e))})},handleProposalVoted:function(e,t,n){var r=this.findProposalById(e)
-r&&r.set("votesCount",n)},handleProposalExecuted:function(e,t,n){var r=this.findProposalById(e)
-r.get("isExecuted")?console.debug("[events] proposal already executed, not adding from event"):(r.set("executed",!0),this.contributors.findBy("id",t.toString()).incrementProperty("balance",n))},handleTransfer:function(e,t,n){n=n.toNumber(),this.contributors.findBy("address",e).decrementProperty("balance",n),this.contributors.findBy("address",t).incrementProperty("balance",n)}})
-e.default=c}),define("kredits-web/templates/application-loading",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"/K85jZFR",block:'{"symbols":[],"statements":[[1,[21,"loading-spinner"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/application-loading.hbs"}})
-e.default=t}),define("kredits-web/templates/application",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"M6vaFJ5T",block:'{"symbols":[],"statements":[[7,"header"],[11,"id","topbar"],[9],[0,"\\n  "],[7,"h1"],[9],[0,"Kosmos Kredits"],[10],[0,"\\n\\n  "],[7,"section"],[11,"id","user-account"],[9],[0,"\\n"],[4,"if",[[23,["kredits","hasAccounts"]]],null,{"statements":[[4,"if",[[23,["kredits","currentUser"]]],null,{"statements":[[0,"        "],[1,[23,["kredits","currentUser","name"]],false],[0,"\\n        "],[4,"if",[[23,["kredits","currentUserIsCore"]]],null,{"statements":[[0,"(core)"]],"parameters":[]},null],[0,"\\n"]],"parameters":[]},null]],"parameters":[]},{"statements":[[0,"      Anonymous\\n"]],"parameters":[]}],[0,"  "],[10],[0,"\\n"],[10],[0,"\\n\\n"],[1,[21,"outlet"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/application.hbs"}})
-e.default=t}),define("kredits-web/templates/contributions/new",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"YPbtYII6",block:'{"symbols":[],"statements":[[7,"main"],[11,"class","center-column"],[9],[0,"\\n\\n  "],[7,"section"],[11,"id","add-contribution"],[9],[0,"\\n    "],[7,"header"],[9],[0,"\\n      "],[7,"h2"],[9],[0,"Submit a contribution"],[10],[0,"\\n    "],[10],[0,"\\n\\n    "],[7,"div"],[11,"class","content"],[9],[0,"\\n      "],[1,[27,"add-contribution",null,[["contributors","save"],[[23,["sortedContributors"]],[27,"action",[[22,0,[]],"save"],null]]]],false],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/contributions/new.hbs"}})
-e.default=t}),define("kredits-web/templates/contributors/edit",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"LZQyoYt+",block:'{"symbols":[],"statements":[[7,"main"],[11,"class","center-column"],[9],[0,"\\n\\n  "],[7,"section"],[11,"id","add-contributor"],[9],[0,"\\n    "],[7,"header"],[9],[0,"\\n      "],[7,"h2"],[9],[0,"Update contributor profile"],[10],[0,"\\n    "],[10],[0,"\\n\\n    "],[7,"div"],[11,"class","content"],[9],[0,"\\n      "],[1,[27,"add-contributor",null,[["attributes","save"],[[23,["attributes"]],[27,"action",[[22,0,[]],"save"],null]]]],false],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/contributors/edit.hbs"}})
-e.default=t}),define("kredits-web/templates/contributors/new",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"IoVi6fNU",block:'{"symbols":[],"statements":[[7,"main"],[11,"class","center-column"],[9],[0,"\\n\\n  "],[7,"section"],[11,"id","add-contributor"],[9],[0,"\\n    "],[7,"header"],[9],[0,"\\n      "],[7,"h2"],[9],[0,"Add contributor profile"],[10],[0,"\\n    "],[10],[0,"\\n\\n    "],[7,"div"],[11,"class","content"],[9],[0,"\\n      "],[1,[27,"add-contributor",null,[["save"],[[27,"action",[[22,0,[]],"save"],null]]]],false],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/contributors/new.hbs"}})
-e.default=t}),define("kredits-web/templates/index",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"kSDGlXXL",block:'{"symbols":[],"statements":[[7,"main"],[11,"id","index"],[9],[0,"\\n\\n  "],[7,"div"],[11,"id","stats"],[9],[0,"\\n    "],[7,"section"],[11,"id","people"],[9],[0,"\\n      "],[7,"header"],[11,"class","with-nav"],[9],[0,"\\n        "],[7,"h2"],[9],[0,"Contributors"],[10],[0,"\\n"],[4,"if",[[23,["kredits","hasAccounts"]]],null,{"statements":[[0,"          "],[7,"nav"],[9],[0,"\\n            "],[4,"link-to",["contributors.new"],[["title","class"],["Add contributor profile","button small green"]],{"statements":[[0,"add"]],"parameters":[]},null],[0,"\\n          "],[10],[0,"\\n"]],"parameters":[]},null],[0,"      "],[10],[0,"\\n      "],[7,"div"],[11,"class","content"],[9],[0,"\\n        "],[1,[27,"contributor-list",null,[["contributorList","showUnconfirmedKredits"],[[23,["kreditsToplist"]],[23,["showUnconfirmedKredits"]]]]],false],[0,"\\n\\n        "],[7,"p"],[11,"class","stats"],[9],[0,"\\n          "],[7,"span"],[11,"class","number"],[9],[1,[27,"await",[[23,["kredits","totalKreditsEarned"]]],null],false],[10],[0," kredits confirmed and issued to\\n          "],[7,"span"],[11,"class","number"],[9],[1,[23,["contributorsWithKredits","length"]],false],[10],[0," contributors\\n        "],[10],[0,"\\n        "],[7,"p"],[11,"class","stats"],[9],[0,"\\n          "],[1,[27,"input",null,[["type","id","checked"],["checkbox","hide-unnconfirmed-kredits",[23,["showUnconfirmedKredits"]]]]],false],[0,"\\n          "],[7,"label"],[11,"for","hide-unnconfirmed-kredits"],[9],[0,"Show unconfirmed kredits in toplist"],[10],[0,"\\n        "],[10],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n\\n    "],[7,"section"],[11,"id","contributions-by-type"],[9],[0,"\\n      "],[7,"header"],[9],[0,"\\n        "],[7,"h2"],[9],[0,"Contributions by type"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"div"],[11,"class","content"],[9],[0,"\\n        "],[1,[27,"chart-contributions-by-type",null,[["contributions"],[[23,["contributions"]]]]],false],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n\\n  "],[7,"div"],[11,"id","contributions"],[9],[0,"\\n"],[4,"if",[[23,["contributionsUnconfirmed"]]],null,{"statements":[[0,"      "],[7,"section"],[11,"id","contributions-unconfirmed"],[9],[0,"\\n        "],[7,"header"],[11,"class","with-nav"],[9],[0,"\\n          "],[7,"h2"],[9],[0,"Latest Contributions"],[10],[0,"\\n"],[4,"if",[[23,["kredits","hasAccounts"]]],null,{"statements":[[0,"            "],[7,"nav"],[9],[0,"\\n              "],[4,"link-to",["contributions.new"],[["title","class"],["Submit a contribution","button small green"]],{"statements":[[0,"add"]],"parameters":[]},null],[0,"\\n            "],[10],[0,"\\n"]],"parameters":[]},null],[0,"        "],[10],[0,"\\n        "],[7,"div"],[11,"class","content"],[9],[0,"\\n"],[0,"          "],[1,[27,"contribution-list",null,[["contributions","vetoContribution","contractInteractionEnabled"],[[23,["contributionsUnconfirmedSorted"]],[27,"action",[[22,0,[]],"vetoContribution"],null],[23,["kredits","hasAccounts"]]]]],false],[0,"\\n        "],[10],[0,"\\n      "],[10],[0,"\\n"]],"parameters":[]},null],[0,"\\n    "],[7,"section"],[11,"id","contributions-confirmed"],[9],[0,"\\n      "],[7,"header"],[9],[0,"\\n        "],[7,"h2"],[9],[0,"Confirmed Contributions"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"div"],[11,"class","content"],[9],[0,"\\n        "],[1,[27,"contribution-list",null,[["contributions","vetoContribution"],[[23,["contributionsConfirmedSorted"]],[27,"action",[[22,0,[]],"vetoContribution"],null]]]],false],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/index.hbs"}})
-e.default=t}),define("kredits-web/templates/proposals/new",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"vauAEy3a",block:'{"symbols":[],"statements":[[7,"section"],[11,"id","add-proposal"],[9],[0,"\\n  "],[7,"header"],[9],[0,"\\n    "],[7,"h2"],[9],[0,"Add Proposal"],[10],[0,"\\n  "],[10],[0,"\\n\\n  "],[7,"div"],[11,"class","content"],[9],[0,"\\n    "],[1,[27,"add-proposal",null,[["contributors","save"],[[23,["minedContributors"]],[27,"action",[[22,0,[]],"save"],null]]]],false],[0,"\\n  "],[10],[0,"\\n"],[10],[0,"\\n\\n"]],"hasEval":false}',meta:{moduleName:"kredits-web/templates/proposals/new.hbs"}})
-e.default=t}),define("kredits-web/utils/cps/bignumber",["exports","npm:ethers"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){return Ember.computed(e,{get:function(){var r=this.get(e)
-return r&&t.default.utils.BigNumber.isBigNumber(r)?r[n]():r},set:function(r,i){var o=t.default.utils.bigNumberify(i)
-return this.set(e,o),o[n]()}})}}),define("kredits-web/utils/cps/kredits",["exports","npm:ethers","kredits-web/utils/format-kredits"],function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return Ember.computed(e,{get:function(){var t=this.get(e)
-return(0,n.default)(t,r)},set:function(i,o){var s=t.default.utils.bigNumberify(o)
-return this.set(e,s),(0,n.default)(s,r)}})}}),define("kredits-web/utils/format-kredits",["exports","npm:ethers"],function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=t.default.utils.formatEther(e)
-n.decimals||(r=parseInt(r).toString())
-return r}}),define("kredits-web/utils/group-by",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){var n=Ember.A(),r=e
-r&&r.forEach(function(e){var r=Ember.get(e,t),i=n.findBy("value",r)
-Ember.isPresent(i)?Ember.get(i,"items").push(e):(i={property:t,value:r,items:[e]},n.push(i))})
-return n}}),define("kredits-web/config/environment",[],function(){try{var e="kredits-web/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(r){throw new Error('Could not read config from meta tag with name "'+e+'".')}}),runningTests||require("kredits-web/app").default.create({name:"kredits-web",version:"1.1.0+afc5a5fe"})
-
-//# sourceMappingURL=kredits-web-197c3a17a9acd491a566e77e46e50b52.map

release/index.html

@@ -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%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.1.0%2Bafc5a5fe%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%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%7D%2C%22kreditsApmDomain%22%3A%22open.aragonpm.eth%22%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_JQUERY_INTEGRATION%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.12.0%2B5a618f7e%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-29d147f9bc6d79dbc7aff481f8ee5541.css">
+    <link integrity="" rel="stylesheet" href="/assets/kredits-web-a1a46af359f6abc5253690f6a7b29c6b.css">
 
     
 
@@ -24,8 +24,8 @@
   <body>
     
 
-    <script src="/assets/vendor-801d0f45e82f8bef6ee0b28f728036e5.js" integrity="sha256-0rvoxLzxNRaodYFUkwv5D3zakixGtC+//xKSO9XtbKc= sha512-YNRAvmy8HT14rRH3MwaQciCOYPZwuuiDT5Bsi3aIXUWtADH2HNxR3K88BTGtNEbOXCCSewh0vpkiBt1o1eyTvg==" ></script>
+    <script src="/assets/vendor-21c31ba5343c7b72f638899d335a0531.js" integrity="sha256-5QKR4/TvbS9UoThtAlcyvj54wU+Bcn0hnM0FzjUbvfA= sha512-tHxWM5t9FYFz6DBnXuzWiIMPPW/gNwPaFDOdUL32cWvWcMfjyrhIEPM5I1D6+HQE1kXCEd64a+7UiMdU2hH5JQ==" ></script>
-    <script src="/assets/kredits-web-4214f7a9448535607cb840171b47f23f.js" integrity="sha256-ZDOnvMGSGUvm5BddhSpT+oHY+rkOjBq1nWJQkwozOt8= sha512-KcJoyjiarr0oErrRwWFunNic60KNhjHl7WZqLElEz2D0Js11uvQOVIba61L4KnaxgZZ4NaOQz49faSCWA9c5Ew==" ></script>
+    <script src="/assets/kredits-web-afbc29b08c72e5915f60326c02c8aaf0.js" integrity="sha256-7NimDs4gj3uLie/5x8Y5dQZDjLbYaxqwWOn8eCQMZ84= sha512-L4P1fbUTM9zXge/og2OyK7pKHEG81XUFSWJMeBfMEvamlttklZqZCLXHHfrKyEip8RKPX1/ud7BUGvw01weptQ==" ></script>
 
     
   </body>

tests/fixtures/contributions.js

@@ -1,19 +1,23 @@
 import Model from 'kredits-web/models/contribution';
+import contributors from '../../tests/fixtures/contributors';
 
 const items = [];
 
 const data = [
-  { id: 1, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 1500 },
+  { id: 1, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 1500, kind: 'dev' },
-  { id: 2, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 5000 },
+  { id: 2, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 5000, kind: 'ops' },
-  { id: 3, contributorId: 2, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 1500 },
+  { id: 3, contributorId: 2, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 1500, kind: 'ops' },
-  { id: 4, contributorId: 2, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 1500 },
+  { id: 4, contributorId: 2, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 1500, kind: 'docs' },
-  { id: 5, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 5000 },
+  { id: 5, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: false, amount: 5000, kind: 'design' },
-  { id: 6, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: true, amount: 500 },
+  { id: 6, contributorId: 1, confirmedAtBlock: 1000, claimed: false, vetoed: true, amount: 500, kind: 'dev' },
-  { id: 7, contributorId: 3, confirmedAtBlock: 2000, claimed: false, vetoed: false, amount: 5000 },
+  { id: 7, contributorId: 3, confirmedAtBlock: 2000, claimed: false, vetoed: false, amount: 5000, kind: 'dev' },
-  { id: 8, contributorId: 1, confirmedAtBlock: 2000, claimed: false, vetoed: false, amount: 1500 },
+  { id: 8, contributorId: 1, confirmedAtBlock: 2000, claimed: false, vetoed: false, amount: 1500, kind: 'community' },
-  { id: 9, contributorId: 3, confirmedAtBlock: 2000, claimed: false, vetoed: true, amount: 1500 },
+  { id: 9, contributorId: 3, confirmedAtBlock: 2000, claimed: false, vetoed: true, amount: 1500, kind: 'docs' },
 ];
 
-data.forEach(attrs => items.push(Model.create(attrs)));
+data.forEach(attrs => {
+  attrs.contributor = contributors.findBy('id', attrs.contributorId.toString());
+  items.push(Model.create(attrs))
+});
 
 export default items;

tests/fixtures/contributors.js

@@ -3,9 +3,9 @@ import Contributor from 'kredits-web/models/contributor';
 const contributors = [];
 
 const data = [
-  { id: 1, name: 'Bumi', totalKreditsEarned: 11500 },
+  { id: 1, name: 'Bumi', totalKreditsEarned: 11500, github_uid: 318 },
-  { id: 2, name: 'Râu Cao', totalKreditsEarned: 3000 },
+  { id: 2, name: 'Râu Cao', totalKreditsEarned: 3000, github_uid: 842 },
-  { id: 3, name: 'Manuel', totalKreditsEarned: 0 }
+  { id: 3, name: 'Manuel', totalKreditsEarned: 0, github_uid: 54812 }
 ];
 
 data.forEach(attrs => contributors.push(Contributor.create(attrs)));

tests/integration/components/contribution-list/component-test.js

@@ -1,17 +1,34 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
+import { click, fillIn, render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
+import contributors from '../../../fixtures/contributors';
+import contributions from '../../../fixtures/contributions';
 
 module('Integration | Component | contribution-list', function(hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders all contributions', async function(assert) {
-    // Set any properties with this.set('myProperty', 'value');
+    this.set('fixtures', contributions);
-    // Handle any actions with this.set('myAction', function(val) { ... });
+    await render(hbs`{{contribution-list contributions=fixtures}}`);
 
-    await render(hbs`{{contribution-list}}`);
+    assert.equal(this.element.querySelectorAll('li').length, 9);
+  });
 
-    assert.equal(this.element.textContent.trim(), '');
+  test('it renders filtered contributions', async function(assert) {
+    let service = this.owner.lookup('service:kredits');
+    service.set('contributors', contributors);
+
+    this.set('fixtures', contributions);
+    await render(hbs`{{contribution-list contributions=fixtures showQuickFilter=true}}`);
+
+    await fillIn('.filter-contributor select', '1');
+    assert.equal(this.element.querySelectorAll('li').length, 5, 'select contributor');
+
+    await click('.filter-contribution-size input');
+    assert.equal(this.element.querySelectorAll('li').length, 4, 'hide small contributions');
+
+    await fillIn('.filter-contribution-kind select', 'dev');
+    assert.equal(this.element.querySelectorAll('li').length, 1, 'select kind');
   });
 });

tests/integration/components/contributor-list/component-test.js

@@ -9,13 +9,13 @@ module('Integration | Component | contributor list', function(hooks) {
 
   const toplist = [
     {
-      contributor: Contributor.create({ id: 1, name: 'Bumi' }),
+      contributor: Contributor.create({ id: 1, name: 'Bumi', github_uid: 318 }),
       amountConfirmed: 5500,
       amountUnconfirmed: 1000,
       amountTotal: 6500
     },
     {
-      contributor: Contributor.create({ id: 2, name: 'Râu Cao' }),
+      contributor: Contributor.create({ id: 2, name: 'Râu Cao', github_uid: 842 }),
       amountConfirmed: 1500,
       amountUnconfirmed: 2000,
       amountTotal: 3500
@@ -28,8 +28,8 @@ module('Integration | Component | contributor list', function(hooks) {
 
     assert.dom('tr:nth-child(1) td.person').hasText('Bumi');
     assert.dom('tr:nth-child(1) span.amount').hasText('6500');
-    assert.dom('tr:nth-child(3) td.person').hasText('Râu Cao');
+    assert.dom('tr:nth-child(2) td.person').hasText('Râu Cao');
-    assert.dom('tr:nth-child(3) span.amount').hasText('3500');
+    assert.dom('tr:nth-child(2) span.amount').hasText('3500');
   });
 
   test('it renders confirmed kredits earned', async function(assert) {
@@ -38,7 +38,7 @@ module('Integration | Component | contributor list', function(hooks) {
 
     assert.dom('tr:nth-child(1) td.person').hasText('Bumi');
     assert.dom('tr:nth-child(1) span.amount').hasText('5500');
-    assert.dom('tr:nth-child(3) td.person').hasText('Râu Cao');
+    assert.dom('tr:nth-child(2) td.person').hasText('Râu Cao');
-    assert.dom('tr:nth-child(3) span.amount').hasText('1500');
+    assert.dom('tr:nth-child(2) span.amount').hasText('1500');
   });
 });

tests/integration/components/topbar-account-panel/component-test.js

@@ -0,0 +1,39 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+module('Integration | Component | topbar-account-panel', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('unknown user without wallet (or no permission to get wallet/account info)', async function(assert) {
+    await render(hbs`<TopbarAccountPanel />`);
+
+    assert.ok(this.element.textContent.trim().match(/^Anonymous/));
+  });
+
+  test('unknown user with Ethereum wallet', async function(assert) {
+    let service = this.owner.lookup('service:kredits');
+    service.set('currentUserAccounts', [{ foo: 'bar' }]);
+    await render(hbs`<TopbarAccountPanel />`);
+
+    assert.ok(this.element.textContent.trim().match(/^Anonymous/));
+  });
+
+  test('known contributor', async function(assert) {
+    let service = this.owner.lookup('service:kredits');
+    service.set('currentUserAccounts', [{ foo: 'bar' }]);
+    service.set('currentUser', {
+      name: 'Dorian Nakamoto',
+      isCore: false
+    });
+    await render(hbs`<TopbarAccountPanel />`);
+
+    assert.equal(this.element.textContent.trim(), 'Dorian Nakamoto');
+
+    service.set('currentUser.isCore', true);
+    await render(hbs`<TopbarAccountPanel />`);
+
+    assert.equal(this.element.querySelectorAll('span.core-flag').length, 1);
+  });
+});