From 062afab1aad49d7506b4dcad72c0c1c48e5fe08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Mon, 29 Jul 2019 12:50:04 +0200
Subject: [PATCH 1/2] improved demodata (now loads addresses from
 creator-spreadsheet)

---
 src/dashboard/demodata.js             | 424 ++++++++++++++------------
 src/dashboard/pages/DashboardPage.vue |   2 +-
 src/dashboard/store/modules/db.ts     |   3 +-
 3 files changed, 228 insertions(+), 201 deletions(-)

diff --git a/src/dashboard/demodata.js b/src/dashboard/demodata.js
index 28a19cda..2bfd2be5 100644
--- a/src/dashboard/demodata.js
+++ b/src/dashboard/demodata.js
@@ -1,204 +1,230 @@
-import _ from 'lodash';
+/*eslint no-shadow: [2, { "allow": ["find"] }]*/
 
-let state = {
-  activities: [],
-  creators: [],
-};
+import { map, find, intersection, sum, filter } from 'lodash';
+import addressRegistry from '../../dist/crypto_addresses.json';
 
-function addActivity(obj) {
-  obj.id = state.activities.length + 1;
-  state.activities.push(obj);
-}
+export function build_demodata() {
+  let state = {
+    activities: [],
+    creators: [],
+  };
 
-function addCreator(obj) {
-  obj.id = state.creators.length + 1;
-  obj.priority = obj.priority || 0;
-  obj.thanksAmount = obj.thanksAmount || 0;
-  obj.share = obj.share || null;
-  if (obj.activity) {
-    _.map(obj.activity, a => {
-      a.creator_id = obj.id;
-      addActivity(a);
-    });
-    obj.activity = undefined;
+  function addActivity(obj) {
+    obj.id = state.activities.length + 1;
+    state.activities.push(obj);
   }
-  obj.duration = _.sum(
-    _.map(_.filter(state.activities, a => a.creator_id === obj.id), 'duration')
-  );
-  state.creators.push(obj);
-}
 
-// Add creators
-
-addCreator({
-  name: 'Thankful Team',
-  address: '0x44b8E57DE4494F6424Be86d28D2f0969d57aFca1',
-  url: ['https://getthankful.io'],
-  priority: 1,
-  activity: [
-    {
-      title: 'Thankful',
-      url: 'https://getthankful.io',
-      duration: 3 * 60 + 23,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Erik Bjäreholt',
-  address: '0x497A128cf7C1Dc455Df618eA833e3ed78E49466E',
-  url: ['https://github.com/ErikBjare'],
-  activity: [
-    {
-      title: 'dotfiles',
-      url: 'https://github.com/ErikBjare/dotfiles',
-      duration: 120,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Dwight Lidman',
-  address: '0xFad9Ba550BCaFC73754a4E5d0a2f61b9BEedE71c',
-  url: ['https://github.com/dwilid'],
-  thanksAmount: 1,
-  activity: [
-    {
-      creator_id: 3,
-      title: 'dwilid',
-      url: 'https://github.com/dwilid',
-      duration: 8,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Patrik Laurell',
-  address: '0xbcEf85708670FA0127C484Ac649724B8028Ea08b',
-  url: ['https://github.com/patrik-laurell'],
-  thanksAmount: 1,
-  activity: [
-    {
-      url: 'https://github.com/patrik-laurell',
-      duration: 98,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Veritasium',
-  url: ['https://www.youtube.com/channel/UCHnyfMqiRRG1u-2MsSQLbXA'],
-  activity: [
-    {
-      url: 'https://www.youtube.com/watch?v=aIx2N-viNwY',
-      duration: 7 * 60 + 41,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Ethereum Foundation',
-  url: [
-    'https://github.com/ethereum',
-    'https://www.youtube.com/channel/UCNOfzGXD_C9YMYmnefmPH0g',
-    'https://twitter.com/ethereum',
-  ],
-  thanksAmount: 3,
-  activity: [
-    {
-      creator_id: 6,
-      title: 'The Web We Want by Brewster Kahle (Devcon4)',
-      url: 'https://www.youtube.com/watch?v=rkdFko6wNuc',
-      duration: 37 * 60 + 45,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Scott Manley',
-  url: ['https://www.youtube.com/channel/UCxzC4EngIsMrPmbm6Nxvb-A'],
-});
-
-addCreator({
-  name: 'Hampus Jakobsson',
-  url: [
-    'https://medium.com/@hajak',
-    'https://hajak.se/',
-    'https://twitter.com/hajak',
-  ],
-  activity: [
-    {
-      url: 'https://hajak.se/how-to-plan-your-next-move-7a68bb7d9a2',
-      duration: 212,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Tom Scott',
-  url: ['https://www.youtube.com/channel/UCBa659QWEk1AI4Tg--mrJ2A'],
-});
-
-addCreator({
-  name: '3Blue1Brown',
-  url: ['https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw'],
-  thanksAmount: 1,
-  activity: [
-    {
-      url: 'https://www.youtube.com/watch?v=aircAruvnKk',
-      duration: 19 * 60 + 13,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Crypto Daily',
-  url: ['https://www.youtube.com/channel/UC67AEEecqFEc92nVvcqKdhA'],
-});
-
-addCreator({
-  name: 'Kurzgesagt - In a Nutshell',
-  url: ['https://www.youtube.com/channel/UCsXVk37bltHxD1rDPwtNM8Q'],
-  activity: [
-    {
-      url: 'https://www.youtube.com/watch?v=UjtOGPJ0URM',
-      duration: 9 * 60 + 35,
-    },
-  ],
-});
-
-addCreator({
-  name: 'Jackson Palmer',
-  url: ['http://www.youtube.com/channel/UCTOzxu_HvuJfZtTJ6AZ7rkA'],
-});
-
-addCreator({
-  name: 'aantonop',
-  url: [
-    'https://www.youtube.com/channel/UCJWCJCWOxBYSi5DhCieLOLQ',
-    'https://twitter.com/aantonop',
-  ],
-  thanksAmount: 2,
-  activity: [
-    {
-      url: 'https://www.youtube.com/watch?v=qlAhXo-d-64',
-      duration: 29 * 60,
-    },
-  ],
-});
-
-addCreator({
-  name: 'ActivityWatch',
-  url: [
-    'https://github.com/ActivityWatch',
-    'https://twitter.com/ActivityWatchIt',
-  ],
-  activity: [
-    {
-      url: 'https://github.com/ActivityWatch/activitywatch',
-      duration: 234,
-    },
-  ],
-});
-
-export default state;
+  function addCreator(obj) {
+    obj.id = state.creators.length + 1;
+    obj.priority = obj.priority || 0;
+    obj.thanksAmount = obj.thanksAmount || 0;
+    obj.share = obj.share || null;
+    if (obj.activity) {
+      map(obj.activity, a => {
+        a.creator_id = obj.id;
+        addActivity(a);
+      });
+      obj.activity = undefined;
+    }
+    obj.duration = sum(
+      map(filter(state.activities, a => a.creator_id === obj.id), 'duration')
+    );
+
+    // A shorter and simpler version of _attributeAddressToCreatorFromRegistry in db.ts
+    let reg_creator = find(
+      addressRegistry,
+      reg_c => intersection(reg_c.urls, obj.url).length > 0
+    );
+    if (reg_creator) {
+      obj.address = reg_creator['eth address'];
+      obj.url = Array.from(new Set([...obj.url, ...reg_creator.urls]));
+    }
+
+    state.creators.push(obj);
+  }
+
+  // Add creators
+
+  addCreator({
+    name: 'Thankful Team',
+    address: '0x44b8E57DE4494F6424Be86d28D2f0969d57aFca1',
+    url: ['https://getthankful.io'],
+    //priority: 1,
+    activity: [
+      {
+        title: 'Thankful',
+        url: 'https://getthankful.io',
+        duration: 3 * 60 + 23,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Erik Bjäreholt',
+    address: '0x497A128cf7C1Dc455Df618eA833e3ed78E49466E',
+    url: ['https://github.com/ErikBjare'],
+    activity: [
+      {
+        title: 'dotfiles',
+        url: 'https://github.com/ErikBjare/dotfiles',
+        duration: 120,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Dwight Lidman',
+    address: '0xFad9Ba550BCaFC73754a4E5d0a2f61b9BEedE71c',
+    url: ['https://github.com/dwilid'],
+    activity: [
+      {
+        creator_id: 3,
+        title: 'dwilid',
+        url: 'https://github.com/dwilid',
+        duration: 8,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Patrik Laurell',
+    address: '0xbcEf85708670FA0127C484Ac649724B8028Ea08b',
+    url: ['https://github.com/patrik-laurell'],
+    activity: [
+      {
+        url: 'https://github.com/patrik-laurell',
+        duration: 98,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Veritasium',
+    url: ['https://www.youtube.com/channel/UCHnyfMqiRRG1u-2MsSQLbXA'],
+    activity: [
+      {
+        url: 'https://www.youtube.com/watch?v=aIx2N-viNwY',
+        duration: 7 * 60 + 41,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Ethereum Foundation',
+    url: [
+      'https://github.com/ethereum',
+      'https://www.youtube.com/channel/UCNOfzGXD_C9YMYmnefmPH0g',
+      'https://twitter.com/ethereum',
+    ],
+    thanksAmount: 2,
+    activity: [
+      {
+        creator_id: 6,
+        title: 'The Web We Want by Brewster Kahle (Devcon4)',
+        url: 'https://www.youtube.com/watch?v=rkdFko6wNuc',
+        duration: 37 * 60 + 45,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Scott Manley',
+    url: ['https://www.youtube.com/channel/UCxzC4EngIsMrPmbm6Nxvb-A'],
+    activity: [
+      {
+        url: 'https://www.youtube.com/watch?v=NCMpd7-Cp24',
+        duration: 11 * 60 + 2,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Hampus Jakobsson',
+    thanksAmount: 1,
+    url: [
+      'https://medium.com/@hajak',
+      'https://hajak.se/',
+      'https://twitter.com/hajak',
+    ],
+    activity: [
+      {
+        url: 'https://hajak.se/how-to-plan-your-next-move-7a68bb7d9a2',
+        duration: 8 * 60 + 4,
+      },
+      {
+        url:
+          'https://hajak.se/founders-are-not-fuel-to-be-burnt-on-the-altar-of-innovation-1b7a5354a686',
+        duration: 4 * 60 + 23,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Tom Scott',
+    url: ['https://www.youtube.com/channel/UCBa659QWEk1AI4Tg--mrJ2A'],
+  });
+
+  addCreator({
+    name: '3Blue1Brown',
+    url: ['https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw'],
+    thanksAmount: 1,
+    activity: [
+      {
+        url: 'https://www.youtube.com/watch?v=aircAruvnKk',
+        duration: 19 * 60 + 13,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Crypto Daily',
+    url: ['https://www.youtube.com/channel/UC67AEEecqFEc92nVvcqKdhA'],
+  });
+
+  addCreator({
+    name: 'Kurzgesagt - In a Nutshell',
+    url: ['https://www.youtube.com/channel/UCsXVk37bltHxD1rDPwtNM8Q'],
+    activity: [
+      {
+        url: 'https://www.youtube.com/watch?v=UjtOGPJ0URM',
+        duration: 9 * 60 + 35,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'Jackson Palmer',
+    url: ['http://www.youtube.com/channel/UCTOzxu_HvuJfZtTJ6AZ7rkA'],
+  });
+
+  addCreator({
+    name: 'aantonop',
+    url: [
+      'https://www.youtube.com/channel/UCJWCJCWOxBYSi5DhCieLOLQ',
+      'https://twitter.com/aantonop',
+    ],
+    thanksAmount: 3,
+    activity: [
+      {
+        url: 'https://www.youtube.com/watch?v=qlAhXo-d-64',
+        duration: 29 * 60,
+      },
+    ],
+  });
+
+  addCreator({
+    name: 'ActivityWatch',
+    url: [
+      'https://github.com/ActivityWatch',
+      'https://twitter.com/ActivityWatchIt',
+    ],
+    activity: [
+      {
+        url: 'https://github.com/ActivityWatch/activitywatch',
+        duration: 234,
+      },
+    ],
+  });
+
+  return state;
+}
diff --git a/src/dashboard/pages/DashboardPage.vue b/src/dashboard/pages/DashboardPage.vue
index 067053cc..38aef538 100644
--- a/src/dashboard/pages/DashboardPage.vue
+++ b/src/dashboard/pages/DashboardPage.vue
@@ -75,7 +75,7 @@ div
       // Donation summary
       v-card
         v-card-title
-          span.display-1.ma-2 Donation summary
+          span.display-1.ma-2.mb-0 Donation summary
         donation-summary(ref='donationSummary', @error="$error('Donating failed')($event)", :distribution="distribution")
 
       div.text-xs-center.pt-2.pb-3
diff --git a/src/dashboard/store/modules/db.ts b/src/dashboard/store/modules/db.ts
index 459f7cd3..c2c0d062 100644
--- a/src/dashboard/store/modules/db.ts
+++ b/src/dashboard/store/modules/db.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import demodata from '../../demodata';
+import { build_demodata } from '../../demodata';
 import { getDatabase } from '~/lib/db';
 import { IDonation, IDonationSuccess } from '~/lib/models';
 
@@ -173,6 +173,7 @@ export default {
 
   mutations: {
     demomode(state) {
+      let demodata = build_demodata();
       state.activities = demodata.activities;
       state.creators = demodata.creators;
 

From 55535309edd8b0e4adab62e5ca8a38dad84cc9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik@bjareho.lt>
Date: Mon, 29 Jul 2019 14:37:23 +0200
Subject: [PATCH 2/2] improvd missing addresses text, made dashboard denser,
 improved demodata

---
 .../components/MissingAddressesCard.vue          | 13 ++++++-------
 src/dashboard/demodata.js                        | 16 ++++++++++------
 src/dashboard/pages/DashboardPage.vue            | 12 ++++++------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/dashboard/components/MissingAddressesCard.vue b/src/dashboard/components/MissingAddressesCard.vue
index 333aa232..5ff9afb2 100644
--- a/src/dashboard/components/MissingAddressesCard.vue
+++ b/src/dashboard/components/MissingAddressesCard.vue
@@ -1,17 +1,16 @@
 <template lang="pug">
   v-card.my-3
-    v-card-title.display-1.pb-0
+    v-card-title.title.pb-0
+      v-icon.mr-2(color="blue") info
       | Missing addresses
     v-card-text
-      | To donate, you have to manually fill in the creator addresses. (We're working on making this easier, sorry for the inconvenience)
+      | We couldn't automatically find the addresses for some of your favorite creators.
       br
-      | The below are links to known addresses, and a form to submit missing addresses. In the future, a database with known addresses will be loaded automatically.
+      | You can either fill them in manually or submit them to #[a(href="https://docs.google.com/spreadsheets/d/1-eQaGFvbwCnxY9UCgjYtXRweCT7yu92UC2sqK1UEBWc/edit?usp=sharing") our registry] (a copy of which is shipped with Thankful) using the button below.
 
     v-card-actions.justify-end
-      v-btn(outline, target="_blank", href="https://docs.google.com/spreadsheets/d/1-eQaGFvbwCnxY9UCgjYtXRweCT7yu92UC2sqK1UEBWc/edit?usp=sharing")
-        | List of addresses
-      v-btn(outline, color="blue", target="_blank", href="https://docs.google.com/forms/d/e/1FAIpQLSc0E_Ea6KAa_UELMexYYyJh4E6A0XJCrHGsRRlWDleafNvByA/viewform")
-        | Submit new addresses
+      v-btn(outline, color="primary", target="_blank", href="https://docs.google.com/forms/d/e/1FAIpQLSc0E_Ea6KAa_UELMexYYyJh4E6A0XJCrHGsRRlWDleafNvByA/viewform")
+        | Submit address to registry
 </template>
 
 <script>
diff --git a/src/dashboard/demodata.js b/src/dashboard/demodata.js
index 2bfd2be5..ba5da22f 100644
--- a/src/dashboard/demodata.js
+++ b/src/dashboard/demodata.js
@@ -49,6 +49,7 @@ export function build_demodata() {
     name: 'Thankful Team',
     address: '0x44b8E57DE4494F6424Be86d28D2f0969d57aFca1',
     url: ['https://getthankful.io'],
+    share: 0.05,
     //priority: 1,
     activity: [
       {
@@ -67,7 +68,12 @@ export function build_demodata() {
       {
         title: 'dotfiles',
         url: 'https://github.com/ErikBjare/dotfiles',
-        duration: 120,
+        duration: 3 * 60 + 58,
+      },
+      {
+        title: 'QuantifiedMe',
+        url: 'https://github.com/ErikBjare/QuantifiedMe',
+        duration: 6 * 60 + 38,
       },
     ],
   });
@@ -78,7 +84,6 @@ export function build_demodata() {
     url: ['https://github.com/dwilid'],
     activity: [
       {
-        creator_id: 3,
         title: 'dwilid',
         url: 'https://github.com/dwilid',
         duration: 8,
@@ -116,10 +121,9 @@ export function build_demodata() {
       'https://www.youtube.com/channel/UCNOfzGXD_C9YMYmnefmPH0g',
       'https://twitter.com/ethereum',
     ],
-    thanksAmount: 2,
+    thanksAmount: 1,
     activity: [
       {
-        creator_id: 6,
         title: 'The Web We Want by Brewster Kahle (Devcon4)',
         url: 'https://www.youtube.com/watch?v=rkdFko6wNuc',
         duration: 37 * 60 + 45,
@@ -171,7 +175,7 @@ export function build_demodata() {
     activity: [
       {
         url: 'https://www.youtube.com/watch?v=aircAruvnKk',
-        duration: 19 * 60 + 13,
+        duration: 32 * 60 + 13,
       },
     ],
   });
@@ -203,7 +207,7 @@ export function build_demodata() {
       'https://www.youtube.com/channel/UCJWCJCWOxBYSi5DhCieLOLQ',
       'https://twitter.com/aantonop',
     ],
-    thanksAmount: 3,
+    thanksAmount: 1,
     activity: [
       {
         url: 'https://www.youtube.com/watch?v=qlAhXo-d-64',
diff --git a/src/dashboard/pages/DashboardPage.vue b/src/dashboard/pages/DashboardPage.vue
index 38aef538..81313d92 100644
--- a/src/dashboard/pages/DashboardPage.vue
+++ b/src/dashboard/pages/DashboardPage.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-div
+div(style="margin-top: -1em")
     // Edit creator dialog
     v-dialog(v-model="dialog.edit", max-width='500px', @input='newCreator = false')
       v-card(tile)
@@ -47,14 +47,14 @@ div
     v-container(grid-list-md)
       // Favorite creators
       v-layout(row)
-        v-flex.pa-2
-          span.display-1 Your favorite creators
+        v-flex.px-2
+          span.title Your favorite creators
           span.ml-3.caption(v-show="daysSinceDonation !== null")
             | You last donated {{daysSinceDonation}} days ago
         v-flex(shrink)
           v-tooltip(bottom)
             template(v-slot:activator="{ on }")
-              v-btn(flat, right, small, @click="addCreator()" v-on="on")
+              v-btn(flat, right, small, @click="addCreator()" v-on="on").ma-0
                 v-icon add
                 | Add creator
             span This feature is broken, sorry!
@@ -70,12 +70,12 @@ div
                        @ignore="ignore(creator)"
                        )
 
-      div.my-3
+      div.my-4
 
       // Donation summary
       v-card
         v-card-title
-          span.display-1.ma-2.mb-0 Donation summary
+          span.title.ml-1.mt-1(style="margin-bottom: -0.5em") Donation summary
         donation-summary(ref='donationSummary', @error="$error('Donating failed')($event)", :distribution="distribution")
 
       div.text-xs-center.pt-2.pb-3