Merge pull request #493 from DemocracyEarth/charts

Displays charts with economic data of a DAO.
DemocracyEarth · Jan 16, 2020 · 26ac608 · 26ac608
2 parents 5073c33 + d27dd61
commit 26ac608
Show file tree

Hide file tree

Showing 23 changed files with 540 additions and 197 deletions.
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
@@ -822,9 +822,11 @@
   "not-connected-message": "The application is not connected to a server.",
   "dao-confirm-tally": "You are voting for <strong>{{voteValue}}</strong> on:<br><em>{{proposalName}}</em><br><br>Confirm vote in your blockchain wallet.<br>",
   "dao-default-tally": "You are voting on<br><em>{{proposalName}}</em><br><br>Confirm vote in your blockchain wallet.<br>",
-  "moloch-guild": "Guild.",
+  "moloch-guild": "Budget.",
   "guild-total-shares": "Total Shares",
   "guild-total-assets": "Total Assets",
   "guild-share-value": "Value per Share",
-  "guild-total-value": "Total Value"
+  "guild-total-value": "Total Value",
+  "guild-voting-address": "Voter",
+  "guild-voting-addresses": "Voters"
 }
diff --git a/imports/api/collectives/Collectives.js b/imports/api/collectives/Collectives.js
@@ -97,6 +97,51 @@ Schema.Menu = new SimpleSchema({
   },
 });
 
+Schema.Dataset = new SimpleSchema({
+  data: {
+    type: Array,
+    optional: true,
+    defaultValue: [],
+  },
+  'data.$': {
+    type: Object,
+    optional: true,
+  },
+  'data.$.t': {
+    type: Date,
+    optional: true,
+  },
+  'data.$.x': {
+    type: Number,
+    optional: true,
+    decimal: true,
+  },
+  'data.$.y': {
+    type: Number,
+    optional: true,
+    decimal: true,
+  },
+});
+
+Schema.Chart = new SimpleSchema({
+  guildLabel: {
+    type: String,
+    optional: true,
+  },
+  type: {
+    type: String,
+    optional: true,
+  },
+  dataset: {
+    type: [Schema.Dataset],
+    optional: true,
+  },
+  lastSyncedBlock: {
+    type: Number,
+    optional: true,
+  },
+});
+
 Schema.CollectiveProfile = new SimpleSchema({
   website: {
     type: String,
@@ -111,6 +156,10 @@ Schema.CollectiveProfile = new SimpleSchema({
     type: [Parameter],
     optional: true,
   },
+  chart: {
+    type: [Schema.Chart],
+    optional: true,
+  },
   blockchain: {
     type: Blockchain,
     optional: true,
@@ -161,6 +210,10 @@ Schema.CollectiveProfile = new SimpleSchema({
     type: Date,
     optional: true,
   },
+  lastSyncedBlock: {
+    type: Number,
+    optional: true,
+  },
 });
 
 

diff --git a/imports/api/server/methods.js b/imports/api/server/methods.js
@@ -11,7 +11,7 @@ import { getTime } from '/imports/api/time';
 import { logUser, log, defaults, gui } from '/lib/const';
 import { stripHTML, urlDoctor, fixDBUrl } from '/lib/utils';
 import { notifierHTML } from '/imports/api/notifier/notifierTemplate.js';
-import { computeDAOStats } from '/lib/dao';
+import { refreshDAOs } from '/lib/dao';
 import { getLastTimestamp, getBlockHeight } from '/lib/web3';
 import { Collectives } from '/imports/api/collectives/Collectives';
 
@@ -388,7 +388,7 @@ Meteor.methods({
         Contracts.update({ _id: feed[i]._id }, { $set: { period: newPeriod } });
       }
     }
-    computeDAOStats();
+    refreshDAOs();
   },
 
   async getBlock(collectives) {

diff --git a/imports/startup/both/modules/metamask.js b/imports/startup/both/modules/metamask.js
@@ -382,47 +382,11 @@ const _hasRightToVote = async (memberAddress, proposalIndex, collectiveId) => {
 */
 const _submitVote = async (proposalIndex, uintVote, contract, choice) => {
   const res = await _callDAOMethod('submitVote', [proposalIndex, uintVote], choice.collectiveId, 'send', { from: Meteor.user().username });
+  console.log(res);
   if (res) {
     _pendingTransaction(Meteor.user().username, res, contract, choice);
     displayModal(false, modal);
   }
-
-  /**
-    const collective = Collectives.findOne({ _id: choice.collectiveId });
-    const smartContracts = collective.profile.blockchain.smartContracts;
-
-    const map = _getMethodMap(smartContracts, 'submitVote');
-    const contractABI = JSON.parse(map.abi);
-
-    const dao = await new web3.eth.Contract(contractABI, map.publicAddress);
-
-    await dao.methods[`${'submitVote'}`](proposalIndex, uintVote).send({ from: Meteor.user().username }, (err, res) => {
-      if (err) {
-        let message;
-        switch (err.code) {
-          case -32603:
-            message = TAPi18n.__('metamask-invalid-address');
-            break;
-          case 4001:
-          default:
-            message = TAPi18n.__('metamask-denied-signature');
-        }
-        displayModal(
-          true,
-          {
-            icon: Meteor.settings.public.app.logo,
-            title: TAPi18n.__('wallet'),
-            message,
-            cancel: TAPi18n.__('close'),
-            alertMode: true,
-          },
-        );
-        return err;
-      }
-      _pendingTransaction(Meteor.user().username, res, contract, choice);
-      displayModal(false, modal);
-      return res;
-    });*/
 };
 
 /**

diff --git a/imports/ui/templates/components/collective/guild/guild.html b/imports/ui/templates/components/collective/guild/guild.html
@@ -10,11 +10,20 @@
                 <div class="guild-title">
                   <a href="{{url}}" class="guild-title-label" target="_blank">{{name}}</a>
                 </div>
-                <div class="guild-detail">
+              </div>
+              <div class="guild-detail">
+                <div class="guild-meta">
+                  <img src="{{getImage 'vote-icon-black'}}" class="clock-icon guild-verifier">
+                  <div class="verifier verifier-live verifier-feed verifier-mini">{{{members}}}</div>
+                </div>
+                <div class="guild-meta">
                   <img src="{{getImage 'key'}}" class="clock-icon guild-verifier">
-                  <a href="{{blockchainLink}}" target="_blank" class="verifier verifier-live verifier-feed verifier-mini verifier-key">{{{publicAddress}}}</a>
+                  <a href="{{blockchainLink}}" target="_blank" class="verifier verifier-live verifier-feed verifier-mini verifier-key verifier-guild">{{{publicAddress}}}</a>
                 </div>
               </div>
+              {{#with guildChart}}
+                {{> chart}}
+              {{/with}}
             </div>
           </div>
           <div class="guild-row">
@@ -47,7 +56,7 @@
               {{/with}} 
             </div>
           </div>
-          <div class="guild-row guild-row-total">
+          <div class="guild-row guild-row-last">
             <div class="guild-label">
               {{_ 'guild-total-value'}}
             </div>

diff --git a/imports/ui/templates/components/collective/guild/guild.js b/imports/ui/templates/components/collective/guild/guild.js
@@ -8,6 +8,7 @@ import { getCoin } from '/imports/api/blockchain/modules/web3Util';
 
 import '/imports/ui/templates/components/collective/guild/guild.html';
 import '/imports/ui/templates/components/decision/balance/balance.js';
+import '/imports/ui/templates/widgets/chart/chart.js';
 
 
 const standardBalance = {
@@ -24,7 +25,6 @@ const standardBalance = {
   value: 100,
 };
 
-
 Template.guild.onCreated(function () {
   Template.instance().collective = new ReactiveVar();
   Template.instance().ready = new ReactiveVar(false);
@@ -85,18 +85,21 @@ Template.guild.helpers({
   },
   totalValue() {
     const row = _getRow('guild-total-value', Template.instance());
-    row.tokenTotal = true;
+    row.tokenTotal = false;
     return row;
   },
   getImage(pic) {
     return getImage(Template.instance().imageTemplate.get(), pic);
   },
   members() {
     const count = Template.instance().memberCount.get();
-    if (count === 1) {
-      return `${count} ${TAPi18n.__('member')}`;
+    if (count) {
+      if (count === 1) {
+        return `${count} ${TAPi18n.__('guild-voting-address')}`;
+      }
+      return `${count} ${TAPi18n.__('guild-voting-addresses')}`;
     }
-    return `${count} ${TAPi18n.__('members')}`;
+    return '';
   },
   totalStyle() {
     const coin = getCoin(Template.instance().collective.get().profile.blockchain.coin.code);
@@ -113,4 +116,7 @@ Template.guild.helpers({
   blockchainLink() {
     return `${Meteor.settings.public.web.sites.blockExplorer}/address/${Template.instance().collective.get().profile.blockchain.publicAddress}`;
   },
+  guildChart() {
+    return { collectiveId: this.collectiveId, guildLabel: 'guild-total-assets' };
+  },
 });
diff --git a/imports/ui/templates/components/decision/ballot/ballot.js b/imports/ui/templates/components/decision/ballot/ballot.js
@@ -180,11 +180,11 @@ const _cryptoVote = async () => {
                 switch (voteValue) {
                   case defaults.YES:
                     message = TAPi18n.__('dao-confirm-tally').replace('{{voteValue}}', TAPi18n.__('yes')).replace('{{proposalName}}', getProposalDescription(poll.title, true));
-                    submitVote(poll.importId.toNumber(), 1, poll, contract);
+                    await submitVote(poll.importId.toNumber(), 1, poll, contract);
                     break;
                   case defaults.NO:
                     message = TAPi18n.__('dao-confirm-tally').replace('{{voteValue}}', TAPi18n.__('no')).replace('{{proposalName}}', getProposalDescription(poll.title, true));
-                    submitVote(poll.importId.toNumber(), 2, poll, contract);
+                    await submitVote(poll.importId.toNumber(), 2, poll, contract);
                     break;
                   default:
                     message = TAPi18n.__('dao-default-tally').replace('{{proposalName}}', getProposalDescription(poll.title, true));

diff --git a/imports/ui/templates/layout/sidebar/sidebar.html b/imports/ui/templates/layout/sidebar/sidebar.html
@@ -10,7 +10,6 @@
         <div style="height: 50px"></div>
       </div>
       <div class="menu menu-empty menu-footer">
-        {{{members}}}
         {{{replicator}}}
       </div>
     </div>

diff --git a/imports/ui/templates/layout/sidebar/sidebar.js b/imports/ui/templates/layout/sidebar/sidebar.js
@@ -314,7 +314,7 @@ Template.sidebar.helpers({
     return 0;
   },
   replicator() {
-    return `&#183; <a href="${Meteor.settings.public.web.sites.tokens}" target="_blank" ontouchstart="">${TAPi18n.__('start-a-democracy')}</a>`;
+    return `<a href="${Meteor.settings.public.web.sites.tokens}" target="_blank" ontouchstart="">${TAPi18n.__('start-a-democracy')}</a>`;
   },
   totalDelegates() {
     if (Template.instance().delegates.get()) {

diff --git a/imports/ui/templates/layout/url/home/home.js b/imports/ui/templates/layout/url/home/home.js
@@ -143,7 +143,6 @@ Template.homeFeed.onCreated(function () {
 
   instance.autorun(function (computation) {
     if (subscription.ready()) {
-      console.log(Contracts.findOne());
       const collectiveId = Contracts.findOne().collectiveId;
       Session.set('search', {
         input: '',

diff --git a/imports/ui/templates/widgets/chart/chart.html b/imports/ui/templates/widgets/chart/chart.html
@@ -0,0 +1,6 @@
+
+<template name="chart">
+  <div class="guild-chart">
+    <canvas id="collectiveChart-{{collectiveId}}" class="chart"></canvas>
+  </div>
+</template>