1.17.0

Update dependencies

.editorconfig

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

.eslintrc.js

@@ -1,8 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   globals: {
     console: true
@@ -19,7 +25,10 @@ module.exports = {
   },
   rules: {
     'ember/avoid-leaking-state-in-ember-objects': 'warn',
-    'no-console': 'off'
+    'no-console': 'off',
+    'ember/no-jquery': 'error',
+    'ember/require-computed-property-dependencies': 'warn',
+    'ember/no-observers': 'warn'
   },
   overrides: [
     // node files
@@ -35,13 +44,20 @@ module.exports = {
         'server/**/*.js'
       ],
       parserOptions: {
-        sourceType: 'script',
+        sourceType: 'script'
-        ecmaVersion: 2015
       },
       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'
+      })
     }
   ]
 };

.template-lintrc.js

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

.travis.yml

@@ -14,19 +14,14 @@ notifications:
 addons:
   chrome: stable
 
-cache:
-  directories:
-    - $HOME/.npm
-
 env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
-before_install:
+branches:
-  - npm config set spin false
+  only:
+    - master
 
 script:
-  - npm run lint:hbs
-  - npm run lint:js
   - npm test

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/app.js

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

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 { assign } from '@ember/polyfills';
+import moment from 'moment';
 
 export default Component.extend({
 
@@ -21,18 +23,19 @@ export default Component.extend({
 
   init () {
     this._super(...arguments);
-    this.set('defaultDate', new Date());
+    this.set('defaultDate', moment().startOf('hour').toDate());
-
+    this.set('defaultAttr', {
-    // Default attributes used by reset
-    this.set('attributes', {
       contributorId: null,
       kind: null,
-      date: [new Date()],
+      date: this.defaultDate,
       amount: null,
       description: null,
       url: null,
+      details: null
     });
 
+    this.set('attributes', assign({}, this.defaultAttr, this.attributes));
+
     this.reset();
   },
 
@@ -42,15 +45,21 @@ export default Component.extend({
 
   actions: {
 
-    submit () {
+    submit (evt) {
+      evt.preventDefault();
+
       if (!this.isValid) {
         alert('Invalid data. Please review and try again.');
         return;
       }
 
       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,58 +1,86 @@
-<form {{action "submit" on="submit"}}>
+<form onsubmit={{action "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 this.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 this.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 this.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="bureaucracy" selected={{eq this.kind "bureaucracy"}}>Bureaucracy</option>
-    </select>
+        <option value="community" selected={{eq this.kind "community"}}>Community</option>
-  </p>
+        <option value="design" selected={{eq this.kind "design"}}>Design</option>
-  <p>
+        <option value="dev" selected={{eq this.kind "dev"}}>Development</option>
-    {{ember-flatpickr
+        <option value="docs" selected={{eq this.kind "docs"}}>Documentation</option>
-      allowInput=false
+        <option value="ops" selected={{eq this.kind "ops"}}>IT Operations</option>
-      altFormat="F j, Y"
+        <option value="outreach" selected={{eq this.kind "outreach"}}>Outreach</option>
-      altInput=true
+        <option value="qa" selected={{eq this.kind "qa"}}>Quality Assurance</option>
-      altInputClass="date-alt"
+        <option value="special" selected={{eq this.kind "special"}}>Special</option>
-      date=date
+      </select>
-      dateFormat="Y-m-d"
+    </p>
-      defaultDate=defaultDate
+  </label>
-      maxDate=defaultDate
+  <label>
-      onChange=(action (mut date))
+    <p class="label">Date:</p>
-    }}
+    <p>
-  </p>
+      {{ember-flatpickr
-  <p>
+        date=this.date
-    {{input type="text"
+        defaultDate=this.defaultDate
-            placeholder="500"
+        maxDate=this.defaultDate
-            value=amount
+        enableTime=true
-            class=(if isValidAmount "valid" "")}}
+        time_24hr=true
-  </p>
+        onChange=(action (mut this.date))
-  <p>
+      }}
-    {{input type="text"
+    </p>
-            placeholder="Description"
+  </label>
-            value=description
+  <label>
-            class=(if isValidDescription "valid" "")}}
+    <p class="label">Amount:</p>
-  </p>
+    <p>
-  <p>
+      {{input type="text"
-    {{input type="text"
+              placeholder="500"
-            placeholder="URL (optional)"
+              value=this.amount
-            value=url
+              class=(if this.isValidAmount "valid" "")}}
-            class=(if isValidUrl "valid" "")}}
+    </p>
-  </p>
+  </label>
+  <label>
+    <p class="label">Description:</p>
+    <p>
+      {{input type="text"
+              value=this.description
+              class=(if this.isValidDescription "valid" "")}}
+    </p>
+  </label>
+  <label>
+    <p class="label">URL (optional):</p>
+    <p>
+      {{input type="text"
+              value=this.url
+              class=(if this.isValidUrl "valid" "")}}
+    </p>
+  </label>
+
+  {{#if this.details}}
+    <label>
+      <p class="label">Details:</p>
+      <p>
+        <pre>
+          {{this.details}}
+        </pre>
+      </p>
+    </label>
+  {{/if}}
+
   <p class="actions">
     {{input type="submit"
-            disabled=inProgress
+            disabled=this.inProgress
-            value=(if inProgress "Processing" "Save")}}
+            value=(if this.inProgress "Processing" "Save")}}
   </p>
 </form>
 

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({
 
+  router: service(),
   kredits: 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
     });
   },
 
@@ -52,9 +60,15 @@ export default Component.extend({
 
   actions: {
 
-    submit () {
+    submit (evt) {
+      evt.preventDefault();
+
+      if (!this.kredits.currentUserIsCore) {
+        window.alert('Only core team members can edit profiles. Please ask someone to set you up.');
+        return;
+      }
       if (!this.isValid) {
-        alert('Invalid data. Please review and try again.');
+        window.alert('Invalid data. Please review and try again.');
         return;
       }
 
@@ -70,6 +84,7 @@ export default Component.extend({
         window.alert('Something went wrong. Please check the browser console.');
       }).finally(() => {
         this.set('inProgress', false);
+        this.router.transitionTo('dashboard');
       });
     }
 

app/components/add-contributor/template.hbs

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

app/components/add-proposal/component.js

@@ -1,64 +0,0 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
-import { and, notEmpty } from '@ember/object/computed';
-
-export default Component.extend({
-
-  attributes: null,
-  contributors: Object.freeze([]),
-
-  isValidContributor: notEmpty('contributorId'),
-  isValidAmount: computed('amount', function() {
-    return parseInt(this.amount, 10) > 0;
-  }),
-  isValidDescription: notEmpty('description'),
-  isValidUrl: notEmpty('url'),
-  isValid: and('isValidContributor',
-               'isValidAmount',
-               'isValidDescription'),
-
-  init () {
-    this._super(...arguments);
-
-    // Default attributes used by reset
-    this.set('attributes', {
-      contributorId: null,
-      kind: 'community',
-      amount: null,
-      description: null,
-      url: null,
-    });
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-    this.reset();
-  },
-
-  reset: function() {
-    this.setProperties(this.attributes);
-  },
-
-  actions: {
-    submit() {
-      if (!this.isValid) {
-        alert('Invalid data. Please review and try again.');
-        return;
-      }
-
-      let attributes = Object.keys(this.attributes);
-      let proposal = this.getProperties(attributes);
-      let saved = this.save(proposal);
-
-      // The promise handles inProgress
-      this.set('inProgress', saved);
-
-      saved.then(() => {
-        this.reset();
-        window.scroll(0,0);
-        window.alert('Proposal added.');
-      });
-    }
-  }
-
-});

app/components/add-proposal/template.hbs

@@ -1,44 +0,0 @@
-<form {{action "submit" on="submit"}}>
-  <p>
-    <select required onchange={{action (mut contributorId) value="target.value"}}>
-      <option value="" selected disabled hidden>Contributor</option>
-      {{#each contributors as |contributor|}}
-        <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.github_username}}</option>
-      {{/each}}
-    </select>
-  </p>
-  <p>
-    <select required onchange={{action (mut kind) value="target.value"}}>
-      <option value="community" selected={{eq kind "community"}}>Community</option>
-      <option value="design" selected={{eq kind "design"}}>Design</option>
-      <option value="dev" selected={{eq kind "dev"}}>Development</option>
-      <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
-      <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
-    </select>
-  </p>
-  <p>
-    {{input type="text"
-            placeholder="100"
-            value=amount
-            class=(if isValidAmount "valid" "")}}
-  </p>
-  <p>
-    {{input type="text"
-            placeholder="Description"
-            value=description
-            class=(if isValidDescription "valid" "")}}
-  </p>
-  <p>
-    {{input type="text"
-            placeholder="URL (optional)"
-            value=url
-            class=(if isValidUrl "valid" "")}}
-  </p>
-  <p class="actions">
-    {{input type="submit"
-            disabled=(is-pending inProgress)
-            value=(if (is-pending inProgress) "Processing" "Save")}}
-    {{#link-to "index"}}Back{{/link-to}}
-  </p>
-</form>
-

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

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

app/components/contribution-list/component.js

@@ -6,9 +6,13 @@ import { inject as service } from '@ember/service';
 
 export default Component.extend({
 
+  router: service(),
+
   tagName: 'div',
   classNames: ['contributions'],
 
+  selectedContribution: null,
+
   showQuickFilter: false,
   hideSmallContributions: false,
   contributorId: null,
@@ -20,12 +24,10 @@ export default Component.extend({
   contributors: sort('kredits.contributors', 'contributorsSorting'),
 
   contributorsActive: computed('contributors.[]', 'contributions', function() {
-    let activeIds = this.contributions.mapBy('contributorId')
+    const activeIds = new Set(this.contributions.mapBy('contributorId')
-                                      .map(id => id.toString())
+                                                .map(id => id.toString()));
-                                      .uniq();
+
-    return this.contributors.filter(c => {
+    return this.contributors.filter(c => activeIds.has(c.id.toString()));
-      return activeIds.includes(c.id.toString());
-    });
   }),
 
   contributionKinds: computed('contributions.[]', function() {
@@ -57,6 +59,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,47 +1,43 @@
-{{#if showQuickFilter}}
+{{#if @showQuickFilter}}
   <div class="quick-filter">
     <p>
       <label class="filter-contributor">
         Contributor:
-        <select onchange={{action (mut contributorId) value="target.value"}}>
+        <select onchange={{action (mut this.contributorId) value="target.value"}}>
           <option value="" selected>all</option>
-          {{#each contributorsActive as |contributor|}}
+          {{#each this.contributorsActive as |contributor|}}
-            <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
+            <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
           {{/each}}
         </select>
       </label>
 
       <label class="filter-contribution-kind">
         Kind:
-        <select onchange={{action (mut contributionKind) value="target.value"}}>
+        <select onchange={{action (mut this.contributionKind) value="target.value"}}>
           <option value="" selected>all</option>
-          {{#each contributionKinds as |kind|}}
+          {{#each this.contributionKinds as |kind|}}
-            <option value={{kind}} selected={{eq contributionKind kind}}>{{capitalize-string kind}}</option>
+            <option value={{kind}} selected={{eq this.contributionKind kind}}>{{capitalize-string kind}}</option>
           {{/each}}
         </select>
       </label>
 
       <label class="filter-contribution-size">
-        {{input type="checkbox" checked=hideSmallContributions}}
+        <Input @type="checkbox" @checked={{this.hideSmallContributions}} />
         Hide small contributions
       </label>
     </p>
   </div>
 {{/if}}
 
-<ul class="contribution-list">
+<ul class="contribution-list {{if @loading 'loading'}}">
-  {{#each contributionsFiltered as |contribution|}}
+  {{#each this.contributionsFiltered as |contribution|}}
-    <li data-contribution-id={{contribution.id}} class="{{contribution-status contribution}} {{if contribution.vetoed "vetoed"}}">
+    <li role="button" data-contribution-id={{contribution.id}}
+        {{action "openContributionDetails" contribution}}
+        class="{{contribution-status contribution}}{{if (eq contribution.id @selectedContributionId) " selected"}}">
       <p class="meta">
-        <span class="recipient">{{user-avatar contributor=contribution.contributor}}</span>
+        <span class="recipient"><UserAvatar @contributor={{contribution.contributor}} /></span>
         <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
-        <span class="title">
+        <span class="title">{{contribution.description}}</span>
-          {{#if contribution.url}}
-            <a href={{contribution.url}} target="_blank" rel="noopener" title={{contribution.description}}>{{contribution.description}}</a>
-          {{else}}
-            {{contribution.description}}
-          {{/if}}
-        </span>
       </p>
       <p class="kredits-amount">
         <span class="amount">{{contribution.amount}}</span><span class="symbol">₭S</span>
@@ -49,7 +45,9 @@
       {{#unless contribution.vetoed}}
         {{#unless (is-confirmed-contribution contribution)}}
           <p class="voting">
-            <button {{action "veto" contribution.id}} class="small danger">veto</button>
+            {{input type="button" class="button small danger" value="veto"
+                    click=(action "veto" contribution.id)
+                    disabled=contribution.hasPendingChanges}}
           </p>
         {{/unless}}
       {{/unless}}

app/components/contributor-list/component.js

@@ -2,11 +2,10 @@ import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 
 export default Component.extend({
+  tagName: '',
 
   router: service(),
 
-  tagName: 'table',
-  classNames: 'contributor-list',
   selectedContributorId: null,
 
   actions: {
@@ -16,5 +15,4 @@ export default Component.extend({
     }
 
   }
-
 });

app/components/contributor-list/template.hbs

@@ -1,21 +1,25 @@
-<tbody>
+<table class="contributor-list {{if @loading 'loading'}}">
-  {{#each contributorList as |c|}}
+  <thead>
-    <tr role="button"
+  </thead>
-        class="{{if (is-current-user c.contributor) "current-user"}} {{if (eq c.contributor.id selectedContributorId) "selected"}}"
+  <tbody>
-        {{action "openContributorDetails" c.contributor}}>
+    {{#each @contributorList as |c|}}
-      <td class="person">
+      <tr role="button"
-        {{user-avatar contributor=c.contributor}} {{c.contributor.name}}
+          onclick={{action "openContributorDetails" c.contributor}}
-      </td>
+          class="{{if (is-current-user c.contributor) "current-user"}} {{if (eq c.contributor.id @selectedContributorId) "selected"}}">
-      <td class="kredits">
+        <td class="person">
-        <span class="amount">
+          <UserAvatar @contributor={{c.contributor}} /> {{c.contributor.name}}
-          {{#if showUnconfirmedKredits}}
+        </td>
-            {{c.amountTotal}}
+        <td class="kredits">
-          {{else}}
+          <span class="amount">
-            {{c.amountConfirmed}}
+            {{#if @showUnconfirmedKredits}}
-          {{/if}}
+              {{c.amountTotal}}
-        </span>
+            {{else}}
-        <span class="symbol">₭S</span>
+              {{c.amountConfirmed}}
-      </td>
+            {{/if}}
-    </tr>
+          </span>
-  {{/each}}
+          <span class="symbol">₭S</span>
-</tbody>
+        </td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>

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

@@ -6,7 +6,7 @@ export default Component.extend({
   account: null,
 
   iconComponentName: computed('account.site', function() {
-    if (this.account.site.match(/github|gitea|wiki/)) {
+    if (this.account.site.match(/github|gitea|wiki|zoom/)) {
       return 'icon-account-' + this.account.site.replace(/\./g, '-');
     } else {
       return 'icon-web-globe';

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

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

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

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

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

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

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

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

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

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

app/components/proposal-list/component.js

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

app/components/proposal-list/template.hbs

@@ -1,20 +0,0 @@
-{{#each proposals as |proposal|}}
-  <li data-proposal-id={{proposal.id}} class={{if proposal.isExecuted "confirmed" "unconfirmed"}}>
-    <p class="meta">
-      <span class="category {{proposal.kind}}">♥ ({{proposal.kind}})</span>
-      <span class="recipient">{{proposal.contributor.name}}:</span>
-    </p>
-    <p class="kredits-amount">
-      <span class="amount">{{proposal.amount}}</span><span class="symbol">₭S</span>
-    </p>
-    <p class="description">
-      <span class="description">{{proposal.description}}</span>
-    </p>
-    <p class="voting">
-      {{#unless proposal.isExecuted}}
-        <span class="votes">({{proposal.votesCount}}/{{proposal.votesNeeded}} votes)</span>
-        <button {{action "confirm" proposal.id}}>+1</button>
-      {{/unless}}
-    </p>
-  </li>
-{{/each}}

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 this.setupInProgress}}
+    Connecting account...
+  {{else}}
+    {{#if (and this.kredits.hasAccounts this.kredits.currentUser)}}
+      {{this.kredits.currentUser.name}}
+      {{#if this.kredits.currentUserIsCore}}
+        <span class="core-flag">(core)</span>
+      {{/if}}
+    {{else}}
+      <span class="anonymous">Anonymous</span>
+      <button onclick={{action "signup"}} class="small" type="button">Sign up</button>
+      {{#if this.showConnectButton}}
+        <button onclick={{action "connectAccount"}} class="small green" type="button">Connect account</button>
+      {{/if}}
+    {{/if}}
+  {{/if}}
+</section>

app/components/user-avatar/component.js

@@ -24,6 +24,9 @@ export default Component.extend({
 
     if (github_uid) {
       return `https://avatars2.githubusercontent.com/u/${github_uid}?v=3&s=${SIZES[this.size]}`;
+    } else {
+      // TODO use custom avatar
+      return '';
     }
   })
 

app/controllers/contributions/new.js

@@ -6,6 +6,8 @@ export default Controller.extend({
 
   kredits: service(),
 
+  queryParams: ['contributorId', 'kind', 'amount'],
+
   contributors: alias('kredits.contributors'),
   minedContributors: filterBy('contributors', 'id'),
 

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

@@ -8,6 +8,7 @@ export default Controller.extend({
 
   showDetailsPane: false,
   selectedContributorId: null,
+  selectedContributionId: null,
 
   currentBlock: alias('kredits.currentBlock'),
 
@@ -32,6 +33,10 @@ export default Controller.extend({
   showQuickFilterUnconfirmed: false,
   showQuickFilterConfirmed: false,
 
+  showIntroText: computed('kredits.{hasAccounts,currentUser}', function(){
+    return (!this.kredits.hasAccounts || !this.kredits.currentUser);
+  }),
+
   actions: {
 
     vetoContribution (contributionId) {
@@ -40,12 +45,6 @@ export default Controller.extend({
       });
     },
 
-    confirmProposal (proposalId) {
-      this.kredits.vote(proposalId).then(transaction => {
-        console.debug('[controllers:index] Vote submitted to Ethereum blockhain: '+transaction.hash);
-      });
-    },
-
     toggleQuickFilterUnconfirmed () {
       this.toggleProperty('showQuickFilterUnconfirmed');
     },

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

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

app/controllers/proposals/new.js

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

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/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,48 @@ export default Helper.extend({
   currentBlock: alias('kredits.currentBlock'),
 
   compute([contribution]) {
+    this.setupRecompute(contribution);
+
+    let status = [];
+
     if (contribution.vetoed) {
-      return 'vetoed';
+      status.push('vetoed');
     } else if (contribution.confirmedAt > this.currentBlock) {
-      return 'unconfirmed';
+      status.push('unconfirmed');
     } else {
-      return 'confirmed'
+      status.push('confirmed');
     }
+
+    if (contribution.hasPendingChanges) {
+      status.push('pending');
+    }
+
+    return status.join(' ');
+  },
+
+  destroy () {
+    if (this.teardown) this.teardown();
+    this._super(...arguments);
+  },
+
+  setupRecompute (contribution) {
+    if (this.teardown) this.teardown();
+
+    contribution.addObserver('vetoed' , this, this.triggerRecompute);
+    contribution.addObserver('confirmedAt' , this, this.triggerRecompute);
+    contribution.addObserver('currentBlock' , this, this.triggerRecompute);
+    contribution.addObserver('hasPendingChanges' , this, this.triggerRecompute);
+
+    this.teardown = () => {
+      contribution.removeObserver('vetoed', this, this.triggerRecompute);
+      contribution.removeObserver('confirmedAt', this, this.triggerRecompute);
+      contribution.removeObserver('currentBlock', this, this.triggerRecompute);
+      contribution.removeObserver('hasPendingChanges', this, this.triggerRecompute);
+    };
+  },
+
+  triggerRecompute () {
+    once(this, this.recompute);
   }
 
 });

app/models/contribution.js

@@ -1,5 +1,6 @@
-import EmberObject from '@ember/object';
+import EmberObject, { computed } from '@ember/object';
-import bignumber from 'kredits-web/utils/cps/bignumber';
+import { isEmpty, isPresent } from '@ember/utils';
+import moment from 'moment';
 
 export default EmberObject.extend({
 
@@ -7,22 +8,45 @@ export default EmberObject.extend({
   id: null,
   contributorId: null,
   amount: null,
-  confirmedAt: bignumber('confirmedAtBlock', 'toNumber'),
+  confirmedAt: null,
   vetoed: null,
   ipfsHash: null,
 
-  creatorAccount: null,
+  // contributor model instance
+  contributor: null,
+
+  // TODO contributor who submitted the contribution
+  // submittedBy: null,
 
   // IPFS
   kind: null,
   description: null,
   details: null,
   url: null,
-  ipfsData: '',
+  date: null,
+  time: null,
+
+  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);
+  }),
+
+  serialize () {
+    return JSON.stringify(this);
   }
 
 });

app/models/contributor.js

@@ -1,14 +1,12 @@
 import EmberObject from '@ember/object';
-import bignumber from 'kredits-web/utils/cps/bignumber';
-import kreditsValue from 'kredits-web/utils/cps/kredits';
 
 export default EmberObject.extend({
   // Contract
-  id: bignumber('idRaw', 'toString'),
+  id: null,
   account: null,
-  balance: kreditsValue('balanceRaw'),
+  balance: 0,
-  totalKreditsEarned: bignumber('totalKreditsEarnedRaw', 'toNumber'),
+  totalKreditsEarned: 0,
-  contributionsCount: bignumber('contributionsCountRaw', 'toNumber'),
+  contributionsCount: 0,
   isCore: false,
   ipfsHash: null,
 
@@ -19,6 +17,10 @@ export default EmberObject.extend({
   github_username: null,
   github_uid: null,
   wiki_username: null,
-  ipfsData: ''
+  zoom_display_name: null,
+
+  serialize () {
+    return JSON.stringify(this);
+  }
 
 });

app/models/proposal.js

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

app/resolver.js

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

app/router.js

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

app/routes/application.js

@@ -1,10 +1,11 @@
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
+import { schedule } from '@ember/runloop';
 
 export default Route.extend({
   kredits: service(),
 
-  beforeModel(transition) {
+  beforeModel(/* transition */) {
     const kredits = this.kredits;
 
     return kredits.setup().then(() => {
@@ -12,11 +13,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);
     });
@@ -26,6 +22,18 @@ export default Route.extend({
     return this.kredits.loadInitialData()
       .then(() => {
         this.kredits.addContractEventHandlers();
+      })
+      .then(() => {
+        if (this.kredits.contributorsNeedSync) {
+          schedule('afterRender', this.kredits.syncContributors,
+                   this.kredits.syncContributors.perform);
+        }
+        if (this.kredits.contributionsNeedSync) {
+          schedule('afterRender', this.kredits.syncContributions,
+                   this.kredits.syncContributions.perform);
+        }
+        schedule('afterRender', this.kredits.fetchMissingContributions,
+                 this.kredits.fetchMissingContributions.perform);
       });
   }
 });

app/routes/contributions/new.js

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

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/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/browser-cache.js

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

app/services/kredits.js

@@ -1,37 +1,42 @@
 import ethers from 'ethers';
 import Kredits from 'kredits-contracts';
-import RSVP from 'rsvp';
 
 import Service from '@ember/service';
 import EmberObject from '@ember/object';
 import { computed } from '@ember/object';
 import { alias, notEmpty } from '@ember/object/computed';
-import { isEmpty } from '@ember/utils';
+import { isEmpty, isPresent } from '@ember/utils';
+import { inject as service } from '@ember/service';
+
+import { task, taskGroup } from 'ember-concurrency';
 
 import groupBy from 'kredits-web/utils/group-by';
+import processContributorData from 'kredits-web/utils/process-contributor-data';
+import processContributionData from 'kredits-web/utils/process-contribution-data';
 import formatKredits from 'kredits-web/utils/format-kredits';
 
 import config from 'kredits-web/config/environment';
 import Contributor from 'kredits-web/models/contributor'
-import Proposal from 'kredits-web/models/proposal'
 import Contribution from 'kredits-web/models/contribution'
 
 export default Service.extend({
 
+  browserCache: service(),
+
   currentBlock: null,
   currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
   currentUser: null,
   contributors: null,
   contributions: null,
-  proposals: null,
+  githubAccessToken: null,
 
   currentUserIsContributor: notEmpty('currentUser'),
   currentUserIsCore: alias('currentUser.isCore'),
   hasAccounts: notEmpty('currentUserAccounts'),
 
-  accountNeedsUnlock: computed('currentUserAccounts', function() {
+  // When data was loaded from cache, we need to fetch updates from the network
-    return this.currentUserAccounts && isEmpty(this.currentUserAccounts);
+  contributorsNeedSync: false,
-  }),
+  contributionsNeedSync: false,
 
   contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
     return this.contributions.filter(contribution => {
@@ -80,7 +85,6 @@ export default Service.extend({
   init () {
     this._super(...arguments);
     this.set('contributors', []);
-    this.set('proposals', []);
     this.set('contributions', []);
   },
 
@@ -90,7 +94,7 @@ export default Service.extend({
   getEthProvider () {
     let ethProvider;
 
-    return new RSVP.Promise(async (resolve) => {
+    return new Promise(resolve => {
       function instantiateWithoutAccount () {
         console.debug('[kredits] Creating new instance from npm module class');
         console.debug(`[kredits] providerURL: ${config.web3ProviderUrl}`);
@@ -104,7 +108,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 +127,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();
         }
       }
@@ -171,12 +179,24 @@ export default Service.extend({
       .then(total => total.toNumber());
   }),
 
+  async loadInitialData () {
+    const numCachedContributors = await this.browserCache.contributors.length();
+    if (numCachedContributors > 0) {
+      await this.loadContributorsFromCache();
+      this.set('contributorsNeedSync', true);
+    } else {
+      await this.fetchContributors();
+    }
 
-  loadInitialData () {
+    const numCachedContributions = await this.browserCache.contributions.length();
-    return this.getContributors()
+    if (numCachedContributions > 0) {
-               .then(contributors => this.contributors.pushObjects(contributors))
+      await this.loadContributionsFromCache();
-               .then(() => this.getContributions())
+      this.set('contributionsNeedSync', true);
-               .then(contributions => this.contributions.pushObjects(contributions))
+    } else {
+      await this.fetchContributions({ page: { size: 30 } });
+    }
+
+    return Promise.resolve();
   },
 
   addContributor (attributes) {
@@ -207,15 +227,48 @@ export default Service.extend({
       });
   },
 
-  getContributors () {
+  fetchContributors () {
+    console.debug(`[kredits] Fetching all contributors from the network`);
     return this.kredits.Contributor.all()
-      .then((contributors) => {
+      .then(contributors => {
-        return contributors.map((contributor) => {
+        return contributors.forEach(data => {
-          return Contributor.create(contributor);
+          this.loadContributorFromData(data);
+          return;
         });
+      })
+      .then(() => {
+        return this.cacheLoadedContributors();
       });
   },
 
+  loadContributorFromData(data) {
+    const contributor = Contributor.create(processContributorData(data));
+    const loadedContributor = this.contributors.findBy('id', contributor.id);
+    if (loadedContributor) { this.contributors.removeObject(loadedContributor); }
+    this.contributors.pushObject(contributor);
+    return contributor;
+  },
+
+  async cacheLoadedContributors () {
+    for (const c of this.contributors) {
+      await this.browserCache.contributors.setItem(c.id, c.serialize());
+    }
+    console.debug(`[kredits] Cached ${this.contributors.length} contributors in browser storage`);
+    return Promise.resolve();
+  },
+
+  async loadContributorsFromCache () {
+    return this.browserCache.contributors.iterate((value/*, key , iterationNumber */) => {
+      this.contributors.pushObject(Contributor.create(JSON.parse(value)));
+    }).then((/* result */) => {
+      console.debug(`[kredits] Loaded ${this.contributors.length} contributors from cache`);
+    });
+  },
+
+  syncContributors: task(function * () {
+    yield this.fetchContributors();
+  }),
+
   addContribution (attributes) {
     console.debug('[kredits] add contribution', attributes);
 
@@ -224,84 +277,151 @@ export default Service.extend({
         console.debug('[kredits] add contribution response', data);
         attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
         const contribution = Contribution.create(attributes);
-        // TODO receive from wrapper
+        contribution.set('pendingTx', data);
         contribution.set('confirmedAtBlock', data.blockNumber + 40320);
         this.contributions.pushObject(contribution);
         return contribution;
       });
   },
 
-  addProposal (attributes) {
+  fetchContributions (options = { page: { size: 200 } }) {
-    console.debug('[kredits] add proposal', attributes);
+    console.debug(`[kredits] Fetching contributions from the network`);
-
+    return this.kredits.Contribution.all(options)
-    return this.kredits.Proposal.addProposal(attributes)
-      .then((data) => {
-        console.debug('[kredits] add proposal response', data);
-        attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
-        return Proposal.create(attributes);
-      });
-  },
-
-  getProposals () {
-    return this.kredits.Proposal.all()
-      .then((proposals) => {
-        return proposals.map((proposal) => {
-          proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
-          return Proposal.create(proposal);
-        });
-      });
-  },
-
-  getContributions () {
-    return this.kredits.Contribution.all({page: {size: 200}})
       .then(contributions => {
-        return contributions.map(contribution => {
+        return contributions.map(data => {
-          contribution.contributor = this.contributors.findBy('id', contribution.contributorId.toString());
+          const contribution = this.loadContributionFromData(data);
-          return Contribution.create(contribution);
+          return contribution;
+        });
+      })
+      .then(contributions => {
+        const cacheWrites = contributions.map(c => {
+          return this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+        });
+        return Promise.all(cacheWrites).then(() => {
+          console.debug(`[kredits] Cached ${contributions.length} contributions in browser storage`);
         });
       });
   },
 
-  vote (proposalId) {
+  loadContributionFromData(data) {
-    console.debug('[kredits] vote for', proposalId);
+    const contribution = Contribution.create(processContributionData(data));
-
+    contribution.set('contributor', this.contributors.findBy('id', data.contributorId.toString()));
-    return this.kredits.Proposal.functions.vote(proposalId)
+    const loadedContribution = this.contributions.findBy('id', contribution.id);
-      .then(data => {
+    if (loadedContribution) { this.contributions.removeObject(loadedContribution); }
-        console.debug('[kredits] vote response', data);
+    this.contributions.pushObject(contribution);
-        return data;
+    return contribution;
-      });
   },
 
+  async cacheLoadedContributions () {
+    for (const c of this.contributions) {
+      await this.browserCache.contributions.setItem(c.id, c.serialize());
+    }
+    console.debug(`[kredits] Cached ${this.contributions.length} contributions in browser storage`);
+    return Promise.resolve();
+  },
+
+  async loadContributionsFromCache () {
+    return this.browserCache.contributions.iterate((value/*, key , iterationNumber */) => {
+      this.contributions.pushObject(Contribution.create(JSON.parse(value)));
+    }).then((/* result */) => {
+      console.debug(`[kredits] Loaded ${this.contributions.length} contributions from cache`);
+    });
+  },
+
+  contributionTasks: taskGroup().enqueue(),
+
+  syncContributions: task(function * () {
+    yield this.fetchNewContributions.perform();
+    yield this.syncUnconfirmedContributions.perform();
+  }).group('contributionTasks'),
+
+  fetchNewContributions: task(function * () {
+    const count = yield this.kredits.Contribution.functions.contributionsCount();
+    const lastKnownContributionId = Math.max.apply(null, this.contributions.mapBy('id'));
+    const toFetch = count - lastKnownContributionId;
+
+    if (toFetch > 0) {
+      console.debug(`[kredits] Fetching ${toFetch} new contributions`);
+      for (let id = lastKnownContributionId; id <= count; id++) {
+        const data = yield this.kredits.Contribution.getById(id);
+        const c = this.loadContributionFromData(data);
+        yield this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+      }
+    } else {
+      console.debug(`[kredits] No new contributions to fetch`);
+    }
+  }),
+
+  fetchMissingContributions: task(function * () {
+    const count = yield this.kredits.Contribution.functions.contributionsCount();
+    const allIds = [...Array(count+1).keys()];
+    allIds.shift(); // remove first item, which is 0
+    const loadedContributions = new Set(this.contributions.mapBy('id'));
+    const toFetch = allIds.filter(id => !loadedContributions.has(id));
+    if (toFetch.length === 0) {
+      console.debug(`[kredits] No contributions left to fetch`);
+      return;
+    }
+    console.debug(`[kredits] Fetching ${toFetch.length} past contributions`);
+    let countFetched = 0;
+
+    for (let id = count; id > 0; id--) {
+      if (loadedContributions.has(id)) {
+        continue;
+      } else {
+        const data = yield this.kredits.Contribution.getById(id);
+        const c = this.loadContributionFromData(data);
+        yield this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+        countFetched++;
+        if (countFetched % 20 === 0) {
+          console.debug(`[kredits] Fetched ${countFetched} more contributions`);
+        }
+      }
+    }
+    console.debug(`[kredits] Cached ${countFetched} past contributions`);
+  }).group('contributionTasks'),
+
+  syncUnconfirmedContributions: task(function * () {
+    if (this.contributionsUnconfirmed.length > 0) {
+      console.debug(`[kredits] Syncing unconfirmed contributions`);
+      for (const c of this.contributionsUnconfirmed) {
+        const data = yield this.kredits.Contribution.getById(c.id);
+        const contribution = this.loadContributionFromData(data);
+        yield this.browserCache.contributions.setItem(c.id.toString(), contribution.serialize());
+      }
+    } else {
+      console.debug(`[kredits] No unconfirmed contributions to sync`);
+    }
+  }),
+
   veto (contributionId) {
     console.debug('[kredits] veto against', contributionId);
+    const contribution = this.contributions.findBy('id', contributionId);
 
     return this.kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
       .then(data => {
         console.debug('[kredits] veto response', data);
+        contribution.set('pendingTx', data);
         return data;
       });
   },
 
-  getCurrentUser: computed('kredits.provider', function() {
+  getCurrentUser: computed('kredits.provider', 'currentUserAccounts.[]', function() {
     if (isEmpty(this.currentUserAccounts)) {
-      return RSVP.resolve();
+      return Promise.resolve();
     }
     return this.kredits.Contributor
-      .functions.getContributorIdByAddress(this.get('currentUserAccounts.firstObject'))
+      .functions.getContributorIdByAddress(this.currentUserAccounts.firstObject)
       .then((id) => {
         // check if the user is a contributor or not
         if (id === 0) {
-          return RSVP.resolve();
+          return Promise.resolve();
         } else {
           return this.kredits.Contributor.getById(id);
         }
       });
   }),
 
-  findProposalById(proposalId) {
-    return this.proposals.findBy('id', proposalId.toString());
-  },
-
   // Contract events
   addContractEventHandlers () {
     this.kredits.Contributor
@@ -310,13 +430,9 @@ 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
-      .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));
   },
@@ -337,6 +453,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,48 +478,10 @@ export default Service.extend({
 
     if (contribution) {
       contribution.set('vetoed', true);
+      contribution.set('pendingTx', null);
     }
   },
 
-  handleProposalCreated (proposalId) {
-    let proposal = this.findProposalById(proposalId);
-
-    if (proposal) {
-      console.debug('[events] proposal exists, not adding from event');
-      return;
-    }
-
-    this.kredits.Proposal.getById(proposalId)
-      .then((proposal) => {
-        proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
-        this.proposals.pushObject(Proposal.create(proposal));
-      });
-  },
-
-  // TODO: We may want to reload that proposal to show the voter as voted
-  handleProposalVoted (proposalId, voterId, totalVotes) {
-    let proposal = this.findProposalById(proposalId);
-
-    if (proposal) {
-      proposal.set('votesCount', totalVotes);
-    }
-  },
-
-  handleProposalExecuted (proposalId, contributorId, amount) {
-    let proposal = this.findProposalById(proposalId);
-
-    if (proposal.get('isExecuted')) {
-      console.debug('[events] proposal already executed, not adding from event');
-      return;
-    }
-
-    proposal.set('executed', true);
-
-    this.contributors
-        .findBy('id', contributorId.toString())
-        .incrementProperty('balance', amount);
-  },
-
   handleTransfer (from, to, value) {
     value = value.toNumber();
 

app/styles/_buttons.scss

@@ -10,6 +10,7 @@ button, input[type=submit], .button {
   text-transform: uppercase;
   cursor: pointer;
   letter-spacing: 0.1em;
+  -webkit-appearance: none;
 
   &+button, &+input[type=submit], &+.button {
     margin-left: 0.5rem;
@@ -23,12 +24,16 @@ button, input[type=submit], .button {
     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);
@@ -41,7 +46,7 @@ button, input[type=submit], .button {
     }
   }
 
-  &.green {
+  &.green:not(:disabled) {
     color: $green;
     background-color: rgba(21, 40, 21, 0.6);
     border-color: rgba(21, 40, 21, 1);
@@ -53,4 +58,17 @@ button, input[type=submit], .button {
       border-color: $green;
     }
   }
+
+  &.icon {
+    svg {
+      width: 2rem;
+      height: 2rem;
+      vertical-align: middle;
+      margin-right: 1rem;
+
+      .fg {
+        fill: $primary-color;
+      }
+    }
+  }
 }

app/styles/_colors.scss

@@ -8,8 +8,3 @@ $red: #fb6868;
 $primary-color: $blue;
 
 $body-text-color: #fff;
-
-#topbar {
-  background-color: rgba(255, 0, 255, .2);
-}
-

app/styles/_forms.scss

@@ -1,12 +1,20 @@
 section#add-contributor,
 section#add-contribution,
-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

@@ -28,6 +28,71 @@ 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;
+        }
+      }
+    }
+  }
+}
+
+#intro {
+  padding: 2rem;
+  background-color: rgba(0,0,0,.2);
+  font-size: 1.6rem;
+
+  @include media-max(small) {
+    padding: 2rem 1rem;
+    font-size: 1.4rem;
+  }
+
+  h2 {
+    font-size: inherit;
+    margin-bottom: 1em;
+  }
+
+  p {
+    margin-bottom: 1em;
+    line-height: 1.5em;
+    font-size: 1.2rem;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  a {
+    text-decoration: none;
+
+    &:hover, &:active {
+      text-decoration: underline;
+    }
+  }
 }
 
 @media (min-width: 550px) {

app/styles/_sugar.scss

@@ -0,0 +1,17 @@
+@mixin loading-border-top {
+  &::before {
+    display: block;
+    width: 100%;
+    height: 1px;
+    content: '';
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.2) 40%, #68d7fb 60%, rgba(255, 255, 255, 0.2));
+    background-size: 200% 200%;
+    animation: kitt 2.5s linear infinite;
+  }
+}
+
+@keyframes kitt {
+  0%{ background-position: 0% 0%}
+  50%{ background-position: 100% 0%}
+  100%{ background-position: 0% 0%}
+}

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;
@@ -69,22 +76,6 @@ section {
       }
     }
   }
-
-  &#proposals-open, &#proposals-closed {
-    .actions {
-      padding-top: 3rem;
-      font-size: 1rem;
-      color: $primary-color;
-      text-align: center;
-      @include media-max(small) {
-        padding-top: 2rem;
-      }
-
-      a {
-        color: $primary-color;
-      }
-    }
-  }
 }
 
 @media (min-width: 550px) {
@@ -97,12 +88,14 @@ section {
 
 @import "buttons";
 @import "forms";
+@import "sugar";
 
 @import "components/contribution-list";
+@import "components/contribution-details";
 @import "components/contributor-list";
 @import "components/contributor-profile";
 @import "components/external-account-link";
 @import "components/loading-spinner";
-@import "components/proposal-list";
 @import "components/topbar";
+@import "components/topbar-account-panel";
 @import "components/user-avatar";

app/styles/components/_contribution-details.scss

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

app/styles/components/_contribution-list.scss

@@ -11,13 +11,10 @@ main section {
   margin-bottom: 2rem;
 
   p {
-    font-size: inherit;
     padding: 0.2rem 0 0;
   }
 
   label {
-    font-size: inherit;
-
     &+ label {
       margin-left: 3.6rem;
     }
@@ -37,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);
@@ -52,10 +50,13 @@ 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;
@@ -67,11 +68,8 @@ ul.contribution-list {
     }
 
     span {
-      font-size: inherit;
-
       &.title {
         a {
-          font-size: inherit;
           text-decoration: none;
           color: $body-text-color;
         }
@@ -116,39 +114,12 @@ ul.contribution-list {
     }
   }
 
-}
+  &.loading {
+    @include loading-border-top;
 
-@media (min-width: 550px) {
-  ul.proposal-list {
     li {
-      grid-template-columns: auto 10rem;
+      &:first-of-type {
-      grid-row-gap: 0.5rem;
+        border-top: none;
-
-      p {
-        &.kredits-amount, &.voting {
-          text-align: right;
-        }
-      }
-
-      &.unconfirmed {
-        p {
-          &.kredits-amount, &.voting {
-            text-align: right;
-          }
-
-          &.description {
-            grid-column-start: span 1;
-          }
-
-          &.voting {
-            grid-column-start: span 1;
-          }
-        }
-      }
-
-
-      .description {
-        font-size: inherit;
       }
     }
   }

app/styles/components/_contributor-list.scss

@@ -1,4 +1,5 @@
 table.contributor-list {
+  position: relative;
   width: 100%;
   border-collapse: collapse;
   margin-bottom: 1.5rem;
@@ -48,4 +49,11 @@ table.contributor-list {
       }
     }
   }
+
+  &.loading {
+    @include loading-border-top;
+    &::before {
+      position: absolute;
+    }
+  }
 }

app/styles/components/_contributor-profile.scss

@@ -42,6 +42,10 @@ section#contributor-profile {
         }
       }
     }
+
+    .actions {
+      margin-top: 2rem;
+    }
   }
 
   .actions {

app/styles/components/_proposal-list.scss

@@ -1,114 +0,0 @@
-ul.proposal-list {
-  clear: both;
-  width: 100%;
-  list-style: none;
-
-  li {
-    display: grid;
-    grid-template-columns: auto 5rem;
-    grid-row-gap: 0.5rem;
-    padding: 1rem 1.2rem;
-    background-color: rgba(255,255,255,0.1);
-    font-size: 1.2rem;
-    border-bottom: 1px solid rgba(255,255,255,0.2);
-
-    &:first-of-type {
-      border-top: 1px solid rgba(255,255,255,0.2);
-    }
-
-    p {
-      align-self: center;
-      margin: 0;
-      font-size: inherit;
-      line-height: 2rem;
-
-      &.kredits-amount, &.voting {
-        text-align: right;
-      }
-
-      &.description {
-        grid-column-start: span 2;
-      }
-
-      &.voting {
-        grid-column-start: span 2;
-      }
-    }
-
-    span {
-      font-size: inherit;
-    }
-
-    .description {
-      line-height: 1.4em;
-      font-size: 1rem;
-    }
-
-    .category {
-      color: $blue;
-      padding-right: 0.2rem;
-      &.community { color: $red; }
-      &.dev       { color: $pink; }
-      &.design    { color: $yellow; }
-      &.docs      { color: $green; }
-      &.ops       { color: $purple; }
-    }
-
-    .amount {
-      font-weight: 500;
-    }
-
-    .symbol {
-      font-size: 1rem;
-      font-weight: 500;
-      padding-left: 0.2rem;
-    }
-
-    .recipient {
-      font-weight: 500;
-    }
-
-    .votes {
-      font-size: 1rem;
-      color: $primary-color;
-      margin-right: 0.5rem;
-    }
-  }
-
-}
-
-@media (min-width: 550px) {
-  ul.proposal-list {
-    li {
-      grid-template-columns: auto 10rem;
-      grid-row-gap: 0.5rem;
-
-      p {
-        &.kredits-amount, &.voting {
-          text-align: right;
-        }
-      }
-
-      &.unconfirmed {
-        p {
-          &.kredits-amount, &.voting {
-            text-align: right;
-          }
-
-          &.description {
-            grid-column-start: span 1;
-          }
-
-          &.voting {
-            grid-column-start: span 1;
-          }
-        }
-      }
-
-
-      .description {
-        font-size: inherit;
-      }
-    }
-  }
-}

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

@@ -0,0 +1,17 @@
+header#topbar section#user-account {
+
+  button {
+    margin-left: 1.5rem;
+  }
+
+  button + button {
+    margin-left: 0.6rem;
+  }
+
+  @include media-max(small) {
+    .anonymous {
+      display: none;
+    }
+  }
+
+}

app/templates/application-loading.hbs

@@ -1 +1 @@
-{{loading-spinner}}
+<LoadingSpinner />

app/templates/application.hbs

@@ -1,16 +1,6 @@
 <header id="topbar">
-  <h1>{{link-to "Kosmos Kredits" "dashboard"}}</h1>
+  <h1><LinkTo @route="dashboard">Kosmos Kredits</LinkTo></h1>
-
+  <TopbarAccountPanel />
-  <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/components/icon-account-github-com.hbs

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

app/templates/components/icon-account-zoom-us.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/templates/components/icon-warning.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/templates/contributions/new.hbs

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

app/templates/contributions/resubmit.hbs

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

app/templates/contributors/edit.hbs

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

app/templates/contributors/new.hbs

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

app/templates/dashboard.hbs

@@ -1,26 +1,45 @@
-<main id="dashboard" class={{if showDetailsPane "with-details"}}>
+{{#if this.showIntroText}}
+  <div id="intro" class={{if this.showDetailsPane "with-details"}}>
+    <h2>
+      Welcome to the contribution dashboard of the
+      <a href="https://kosmos.org" target="_blank" rel="noreferrer noopener">Kosmos</a> project!
+    </h2>
+    <p>
+      If you want to learn more about what the numbers mean and how this works,
+      check out the
+      <a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noreferrer noopener">Kredits documentation</a>.
+      If you want to start earning kredits for your contributions,
+      <LinkTo @route="signup">create a contributor profile</LinkTo>.
+    </p>
+  </div>
+{{/if}}
+
+<main id="dashboard" class={{if this.showDetailsPane "with-details"}}>
 
   <div id="stats">
     <section id="people">
       <header class="with-nav">
         <h2>Contributors</h2>
-        {{#if kredits.hasAccounts}}
+        {{#if this.kredits.hasAccounts}}
           <nav>
-            {{link-to "add" "contributors.new" title="Add contributor profile" class="button small green"}}
+            <LinkTo @route="contributors.new" @title="Add contributor profile" class="button small green">add</LinkTo>
           </nav>
         {{/if}}
       </header>
       <div class="content">
-        {{contributor-list contributorList=kreditsToplist
+        <ContributorList @contributorList={{this.kreditsToplist}}
-                           showUnconfirmedKredits=showUnconfirmedKredits
+                         @showUnconfirmedKredits={{this.showUnconfirmedKredits}}
-                           selectedContributorId=selectedContributorId}}
+                         @selectedContributorId={{this.selectedContributorId}}
+                         @loading={{this.kredits.syncContributors.isRunning}} />
 
         <p class="stats">
-          <span class="number">{{await kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
+          <span class="number">{{await this.kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
-          <span class="number">{{contributorsWithKredits.length}}</span> contributors
+          <span class="number">{{this.contributorsWithKredits.length}}</span> contributors
         </p>
         <p class="stats">
-          {{input type="checkbox" id="hide-unnconfirmed-kredits" checked=showUnconfirmedKredits}}
+          <Input id="hide-unnconfirmed-kredits"
+                 @type="checkbox"
+                 @checked={{this.showUnconfirmedKredits}} />
           <label for="hide-unnconfirmed-kredits">Show unconfirmed kredits in toplist</label>
         </p>
       </div>
@@ -31,29 +50,39 @@
         <h2>Contributions by type</h2>
       </header>
       <div class="content">
-        {{chart-contributions-by-type contributions=contributions}}
+        <ChartContributionsByType @contributions={{this.contributions}} />
       </div>
     </section>
   </div>
 
   <div id="contributions">
-    {{#if contributionsUnconfirmed}}
+    {{#if this.contributionsUnconfirmed}}
       <section id="contributions-unconfirmed">
         <header class="with-nav">
-          <h2>Latest Contributions</h2>
+          <h2>
-          {{#if kredits.hasAccounts}}
+            Latest Contributions
-            <nav>
+          </h2>
-              <button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
+          <nav>
-              {{link-to "add" "contributions.new" title="Submit a contribution" class="button small green"}}
+            <button type="button"
-            </nav>
+                    onclick={{action "toggleQuickFilterUnconfirmed"}}
-          {{/if}}
+                    class="small {{if this.showQuickFilterUnconfirmed "active"}}">
+              filter
+            </button>
+            {{#if this.kredits.hasAccounts}}
+              <LinkTo @route="contributions.new"
+                      @title="Submit a contribution"
+                      class="button small green">add</LinkTo>
+            {{/if}}
+          </nav>
         </header>
         <div class="content">
           {{!-- TODO: We need a better naming for kredits.hasAccounts --}}
-          {{contribution-list contributions=contributionsUnconfirmedSorted
+          <ContributionList @contributions={{this.contributionsUnconfirmedSorted}}
-                              vetoContribution=(action "vetoContribution")
+                            @vetoContribution={{action "vetoContribution"}}
-                              contractInteractionEnabled=kredits.hasAccounts
+                            @contractInteractionEnabled={{this.kredits.hasAccounts}}
-                              showQuickFilter=showQuickFilterUnconfirmed}}
+                            @selectedContributionId={{this.selectedContributionId}}
+                            @showQuickFilter={{this.showQuickFilterUnconfirmed}}
+                            @loading={{this.kredits.syncContributions.isRunning}}/>
         </div>
       </section>
     {{/if}}
@@ -62,13 +91,18 @@
       <header class="with-nav">
         <h2>Confirmed Contributions</h2>
         <nav>
-          <button {{action "toggleQuickFilterConfirmed"}} class="small {{if showQuickFilterConfirmed "active"}}">filter</button>
+          <button type="button"
+                  onclick={{action "toggleQuickFilterConfirmed"}}
+                  class="small {{if this.showQuickFilterConfirmed "active"}}">
+            filter
+          </button>
         </nav>
       </header>
       <div class="content">
-        {{contribution-list contributions=contributionsConfirmedSorted
+        <ContributionList @contributions={{this.contributionsConfirmedSorted}}
-                            vetoContribution=(action "vetoContribution")
+                          @vetoContribution={{action "vetoContribution"}}
-                            showQuickFilter=showQuickFilterConfirmed}}
+                          @selectedContributionId={{this.selectedContributionId}}
+                          @showQuickFilter={{this.showQuickFilterConfirmed}} />
       </div>
     </section>
   </div>

app/templates/dashboard/contributions/show.hbs

@@ -0,0 +1,62 @@
+<section id="contribution-details" class={{if this.model.vetoed "vetoed"}}>
+  <header class="with-nav">
+    <h2>Contribution #{{this.model.id}}</h2>
+    <nav>
+      <span class="amount">{{this.model.amount}}</span>&nbsp;
+      <span class="symbol">₭S</span>
+    </nav>
+  </header>
+
+  <div class="content">
+    <p class="who-what-when">
+      <span class="contributor">
+        <UserAvatar @contributor={{this.model.contributor}} />
+        <LinkTo @route="dashboard.contributors.show" @model={{this.model.contributor}}>{{this.model.contributor.name}}</LinkTo>
+      </span>
+      contributed
+      <span class="date" title={{this.model.iso8601Date}}>{{moment-from this.model.iso8601Date}}</span>:
+    </p>
+    <h3>{{this.model.description}}</h3>
+    <p>
+      Kind: {{this.model.kind}}
+      <br>Status: {{contribution-status this.model}}
+    </p>
+    {{#if this.model.url}}
+      <p>
+        <a href={{this.model.url}}
+           title={{this.model.description}}
+           class="button"
+           target="_blank"
+           rel="noopener noreferrer">
+          Open URL
+        </a>
+      </p>
+    {{/if}}
+    {{#if this.model.vetoed}}
+      <div class="hint vetoed">
+        <div class="icon">
+          <IconWarning />
+        </div>
+        <p>
+          This contribution has been vetoed, meaning no
+          kredits will be issued.
+        </p>
+        <p>
+          <LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small green">Re-submit contribution …</LinkTo>
+        </p>
+      </div>
+    {{/if}}
+  </div>
+
+  <div class="actions">
+    <p>
+      <LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small">Copy & edit as new</LinkTo>
+      {{#if this.model.ipfsHash}}
+        <a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}"
+           class="button small" target="_blank" rel="noopener noreferrer">
+          Inspect IPFS data
+        </a>
+      {{/if}}
+    </p>
+  </div>
+</section>

app/templates/dashboard/contributors/show.hbs

@@ -1,36 +1,41 @@
 <section id="contributor-profile">
   <header>
-    {{user-avatar contributor=model size="medium"}}
+    <UserAvatar @contributor={{this.model}} @size="medium" />
   </header>
 
   <div class="content">
-    <h2>{{model.name}}</h2>
+    <h2>{{this.model.name}}</h2>
-    <p class="role">{{roleName}}</p>
+    <p class="role">{{this.roleName}}</p>
 
     <ul class="external-accounts">
-      {{#each model.accounts as |account|}}
+      {{#each this.model.accounts as |account|}}
         <li>
-          {{external-account-link account=account}}
+          <ExternalAccountLink @account={{account}} />
         </li>
       {{/each}}
-      {{#if model.url}}
+      {{#if this.model.url}}
         <li>
-          <a href={{model.url}} target="_blank" rel="noopener" title="Website">
+          <a href={{this.model.url}} target="_blank" rel="noopener noreferrer" title="Website">
             <span class="site">Web</span>
-            {{icon-web-globe}}
+            <IconWebGlobe />
           </a>
         </li>
       {{/if}}
     </ul>
+    <div class="actions">
+      <p>
+        <LinkTo @route="contributions.new" @query={{hash contributorId=this.model.id}} class="button green">♥ Give kredits</LinkTo>
+      </p>
+    </div>
   </div>
 
   <div class="actions">
     <p>
-      <a href="https://rinkeby.etherscan.io/address/{{model.account}}" class="button small" target="_blank" rel="noopener">Inspect Ethereum transactions</a>
+      <a href="https://rinkeby.etherscan.io/address/{{this.model.account}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect Ethereum transactions</a>
-      {{#if model.ipfsHash}}
+      {{#if this.model.ipfsHash}}
-        <a href="https://ipfs.io/ipfs/{{model.ipfsHash}}" class="button small" target="_blank" rel="noopener">Inspect IPFS profile</a>
+        <a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect IPFS profile</a>
       {{/if}}
-      {{link-to "Edit profile" "contributors.edit" model class="button small"}}
+      <LinkTo @route="contributors.edit" @model={{this.model}} class="button small">Edit profile</LinkTo>
     </p>
   </div>
 </section>

app/templates/proposals/new.hbs

@@ -1,10 +0,0 @@
-<section id="add-proposal">
-  <header>
-    <h2>Add Proposal</h2>
-  </header>
-
-  <div class="content">
-    {{add-proposal contributors=minedContributors save=(action "save")}}
-  </div>
-</section>
-

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">
+    <LinkTo @route="dashboard" class="button small">Return to dashboard</LinkTo>
+  </p>
+</div>

app/templates/signup/eth-account.hbs

@@ -0,0 +1,24 @@
+<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>
+    <p>
+      <label>
+        Ethereum account:<br>
+        <Input @type="text" @value={{this.ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if this.isValidEthAccount "valid" ""}} />
+      </label>
+    </p>
+  </form>
+  <p class="actions">
+    <button disabled={{this.signupButtonDisabled}}
+            onclick={{action "completeSignup"}}
+            type="button">
+      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 onclick={{action "connectGithub"}} class="icon" type="button">
+      <IconAccountGithubCom />
+      Connect GitHub
+    </button>
+  </p>
+</div>

app/utils/cps/bignumber.js

@@ -1,20 +0,0 @@
-import { computed } from '@ember/object';
-import ethers from 'ethers';
-
-export default function(dependentKey, converterMethod) {
-  return computed(dependentKey, {
-    get () {
-      let value = this.get(dependentKey);
-      if (value && ethers.utils.BigNumber.isBigNumber(value)) {
-        return value[converterMethod]();
-      } else {
-        return value;
-      }
-    },
-    set (key, value) {
-      const bnValue = ethers.utils.bigNumberify(value);
-      this.set(dependentKey, bnValue);
-      return bnValue[converterMethod]();
-    }
-  });
-}

app/utils/cps/kredits.js

@@ -1,17 +0,0 @@
-import { computed } from '@ember/object';
-import ethers from 'ethers';
-import formatKredits from 'kredits-web/utils/format-kredits';
-
-export default function(dependentKey, options = {}) {
-  return computed(dependentKey, {
-    get () {
-      const value = this.get(dependentKey);
-      return formatKredits(value, options);
-    },
-    set (key, value) {
-      const bnValue = ethers.utils.bigNumberify(value);
-      this.set(dependentKey, bnValue);
-      return formatKredits(bnValue, options);
-    }
-  });
-}

app/utils/process-contribution-data.js

@@ -0,0 +1,21 @@
+export default function processContributionData(data) {
+  const processed = {}
+
+  if (data.confirmedAtBlock && (typeof data.confirmedAtBlock.toNumber === 'function')) {
+    processed.confirmedAt = data.confirmedAtBlock.toNumber();
+  } else if (data.confirmedAt !== 'undefined') {
+    processed.confirmedAt = data.confirmedAt;
+  }
+
+  const otherProperties = [
+    'id', 'contributorId', 'amount', 'vetoed',
+    'ipfsHash', 'kind', 'description', 'details',
+    'url', 'date', 'time', 'pendingTx'
+  ];
+
+  otherProperties.forEach(prop => {
+    processed[prop] = data[prop];
+  });
+
+  return processed;
+}

app/utils/process-contributor-data.js

@@ -0,0 +1,19 @@
+export default function processContributorData(data) {
+  const processed = {
+    id: data.id.toString(),
+    balance: data.balanceInt,
+    totalKreditsEarned: data.totalKreditsEarned,
+    contributionsCount: data.contributionsCount?.toNumber()
+  }
+
+  const otherProperties = [
+    'account', 'accounts', 'ipfsHash', 'isCore', 'kind', 'name', 'url',
+    'github_username', 'github_uid', 'wiki_username', 'zoom_display_name'
+  ];
+
+  otherProperties.forEach(prop => {
+    processed[prop] = data[prop];
+  });
+
+  return processed;
+}

config/ember-cli-update.json

@@ -0,0 +1,20 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.18.0",
+      "blueprints": [
+        {
+          "name": "app",
+          "outputRepo": "https://github.com/ember-cli/ember-new-output",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}

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,6 +36,10 @@ 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',
@@ -53,6 +57,9 @@ 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',
@@ -73,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;

config/optional-features.json

@@ -1,3 +1,6 @@
 {
-  "jquery-integration": true
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": false,
+  "template-only-glimmer-components": true
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-web",
-  "version": "1.5.1",
+  "version": "1.17.0",
   "private": true,
   "description": "Contribution dashboard of the Kosmos project",
   "repository": "https://github.com/67P/kredits-web",
@@ -11,12 +11,14 @@
     "test": "tests"
   },
   "scripts": {
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
-    "test": "ember test",
+    "start": "ember serve",
-    "start": "KREDITS_APM_DOMAIN=open.aragonpm.eth ember serve",
+    "test": "npm-run-all lint:* test:*",
-    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember s",
+    "test:ember": "ember test",
-    "build": "ember build",
+    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember serve",
+    "build": "ember build --environment=production",
     "build-prod": "rm -rf release/* && ember build -prod --output-path release",
     "preversion": "npm test",
     "version": "npm run build-prod && git add release/",
@@ -24,50 +26,61 @@
     "deploy": "git push 5apps master"
   },
   "devDependencies": {
-    "@ember/jquery": "^0.5.2",
+    "@ember/optional-features": "^1.3.0",
-    "@ember/optional-features": "^0.6.3",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
+    "@kosmos/schemas": "^2.2.1",
+    "babel-eslint": "^10.1.0",
     "babel-preset-es2015": "^6.22.0",
     "babelify": "^7.3.0",
     "brfs": "^2.0.2",
-    "broccoli-asset-rev": "^2.7.0",
+    "broccoli-asset-rev": "^3.0.0",
-    "ember-ajax": "^4.0.1",
+    "ember-auto-import": "^1.5.3",
-    "ember-auto-import": "^1.5.2",
     "ember-awesome-macros": "0.41.0",
-    "ember-cli": "~3.8.1",
+    "ember-cli": "~3.18.0",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.1.2",
+    "ember-cli-babel": "^7.20.4",
-    "ember-cli-chart": "^3.4.0",
+    "ember-cli-chart": "^3.6.0",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-htmlbars": "^5.1.2",
-    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-moment-shim": "^3.8.0",
-    "ember-cli-inject-live-reload": "^1.8.2",
+    "ember-cli-sass": "^10.0.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": "^3.0.0",
-    "ember-cli-uglify": "^2.1.0",
+    "ember-concurrency": "^1.1.7",
-    "ember-cli-update": "^0.21.2",
+    "ember-export-application-global": "^2.0.1",
-    "ember-export-application-global": "^2.0.0",
+    "ember-fetch": "^8.0.1",
-    "ember-flatpickr": "^2.14.0",
+    "ember-flatpickr": "^2.16.2",
-    "ember-load-initializers": "^1.1.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-macro-helpers": "0.17.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-promise-helpers": "1.0.6",
+    "ember-moment": "^8.0.0",
-    "ember-qunit": "^3.4.1",
+    "ember-promise-helpers": "^1.0.9",
-    "ember-resolver": "^5.0.1",
+    "ember-qunit": "^4.6.0",
-    "ember-source": "~3.8.0",
+    "ember-resolver": "^8.0.0",
+    "ember-source": "~3.18.0",
+    "ember-template-lint": "^2.8.0",
     "ember-truth-helpers": "github:jmurphyau/ember-truth-helpers#31a14373a31f1f82c77537720549b47a95c28e5f",
-    "eslint-plugin-ember": "^5.2.0",
+    "eslint": "^7.1.0",
-    "ethers": "^4.0.27",
+    "eslint-plugin-ember": "^8.5.2",
-    "kosmos-schemas": "^2.0.0",
+    "eslint-plugin-node": "^11.1.0",
-    "kredits-contracts": "^5.4.0",
+    "ethers": "^4.0.47",
+    "kredits-contracts": "^5.5.0",
     "loader.js": "^4.7.0",
+    "localforage": "^1.7.3",
     "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3",
-    "qunit-dom": "^0.8.0",
+    "npm-run-all": "^4.1.5",
+    "qunit-dom": "^1.2.0",
+    "sass": "^1.26.7",
     "transform-loader": "^0.2.4",
-    "tv4": "^1.3.0"
+    "tv4": "^1.3.0",
+    "web3-utils": "^1.2.8"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "10.* || >= 12"
+  },
+  "ember": {
+    "edition": "octane"
   }
 }