Merge pull request #509 from DemocracyEarth/search

Multiple DAOs
DemocracyEarth · May 16, 2020 · 4b97c88 · 4b97c88
2 parents 06eb7f9 + 56f712f
commit 4b97c88
Show file tree

Hide file tree

Showing 191 changed files with 1,952 additions and 34,463 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -12,7 +12,7 @@
 [email protected]             # Packages every Meteor app needs to have
 [email protected]                 # Meteor's client-side reactive programming library
 [email protected]                # ECMAScript 5 compatibility for older browsers.
-[email protected].0             # Enable ECMAScript2015+ syntax in app code
+[email protected].3             # Enable ECMAScript2015+ syntax in app code
 
 # standard libraries
 [email protected]                # Helpful client-side library
@@ -31,7 +31,7 @@ react-template-helper
 react-meteor-data
 
 # data
-mongo@1.8.0                   # The database Meteor supports right now
+mongo@1.10.0                   # The database Meteor supports right now
 aldeed:simple-schema
 aldeed:collection2
 dburles:collection-helpers
@@ -46,12 +46,12 @@ tap:i18n
 # accounts, users
 [email protected]                 # Client-side reactive dictionary for your app
 [email protected]
-accounts-password@1.5.2
+accounts-password@1.6.0
 [email protected]
 [email protected]
 
 # mobile
-mobile-experience@1.0.5       # Packages for a great mobile UX
+mobile-experience@1.1.0       # Packages for a great mobile UX
 
 # production
 
@@ -79,13 +79,13 @@ edgee:slingshot
 [email protected]
 [email protected]
 [email protected]
-shell-server@0.4.0
+shell-server@0.5.0
 dispatch:mocha-phantomjs
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 mdg:meteor-apm-agent
 tmeasday:publish-counts
 konecty:nrr

diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.9
+METEOR@1.10.2
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,7 +1,7 @@
-accounts-base@1.5.0
+accounts-base@1.6.0
 [email protected]
-accounts-oauth@1.1.16
-accounts-password@1.5.3
+accounts-oauth@1.2.0
+accounts-password@1.6.0
 [email protected]
 [email protected]
 [email protected]
@@ -12,15 +12,15 @@ aldeed:[email protected]
 aldeed:[email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-boilerplate-generator@1.6.0
-[email protected].1
+boilerplate-generator@1.7.0
+[email protected].2
 [email protected]
 [email protected]
 cfs:[email protected]
@@ -32,13 +32,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
-[email protected].1
-[email protected].1
+[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -47,7 +47,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-facebook-oauth@1.6.0
+facebook-oauth@1.7.0
 [email protected]
 [email protected]
 harrison:[email protected]
@@ -56,7 +56,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
@@ -68,7 +68,7 @@ iron:[email protected]
 [email protected]
 kadira:[email protected]
 konecty:[email protected]
-launch-screen@1.1.1
+launch-screen@1.2.0
 [email protected]
 lh84:[email protected]
 [email protected]
@@ -84,25 +84,25 @@ meteorhacks:[email protected]
 meteorhacks:[email protected]
 meteorspark:[email protected]
 [email protected]
-minimongo@1.4.5
+minimongo@1.6.0
 miro:[email protected]
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
+mobile-experience@1.1.0
+mobile-status-bar@1.1.0
 [email protected]
 [email protected]
 [email protected]
-mongo@1.8.0
+mongo@1.10.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 mrt:[email protected]
 mystor:[email protected]
 [email protected]
-npm-mongo@3.3.0
-oauth@1.2.8
-oauth1@1.2.2
-oauth2@1.2.1
+npm-mongo@3.7.1
+oauth@1.3.0
+oauth1@1.3.0
+oauth2@1.3.0
 [email protected]
 [email protected]
 practicalmeteor:[email protected]_1
@@ -113,7 +113,7 @@ practicalmeteor:[email protected]_2
 [email protected]
 raix:[email protected]
 rajit:[email protected]_1
-random@1.1.0
+random@1.2.0
 [email protected]
 [email protected]
 [email protected]
@@ -126,11 +126,11 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-shell-server@0.4.0
-socket-stream-client@0.2.2
+shell-server@0.5.0
+socket-stream-client@0.3.0
 [email protected]
 [email protected]
-srp@1.0.12
+srp@1.1.0
 [email protected]
 tap:[email protected]
 [email protected]
@@ -145,9 +145,9 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-url@1.2.0
+url@1.3.0
 velocityjs:[email protected]
-webapp@1.8.2
+webapp@1.9.1
 [email protected]
 xolvio:[email protected]
-xolvio:cleaner@0.3.3
+xolvio:cleaner@0.4.0
diff --git a/= b/=
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Read our 📃 [white paper](https://github.com/DemocracyEarth/paper) and check o
 
 **Release:**
 
-* Currently [`version 0.7`](https://github.com/DemocracyEarth/sovereign/releases)
+* Currently [`version 0.8`](https://github.com/DemocracyEarth/sovereign/releases)
 * This [User Agreement](https://github.com/DemocracyEarth/sovereign/blob/master/UserAgreement.md) governs access to and use of the Democracy Earth platform.
 
 ## Setup
@@ -104,7 +104,7 @@ Read our 📃 [white paper](https://github.com/DemocracyEarth/paper) and check o
 
 ## Specifications
 
-* Built with [Meteor](https://github.com/meteor/meteor) version 1.9
+* Built with [Meteor](https://github.com/meteor/meteor) version 1.10
 * Check our [documentation](http://docs.democracy.earth) for further technical reference (work in progress).
 
 **Supported Browsers:**

diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
@@ -216,12 +216,12 @@
   "vote-proposal": "<strong>Vote</strong> Proposal",
   "edit-draft": "<strong>Edit</strong> Draft",
   "posted": "Posted",
-  "years-ago" : "years ago.",
-  "months-ago" : "months ago.",
-  "days-ago" : "days ago.",
-  "hours-ago" : "hours ago.",
-  "minutes-ago" : "minutes ago.",
-  "seconds-ago" : "seconds ago.",
+  "years-ago" : "years ago",
+  "months-ago" : "months ago",
+  "days-ago" : "days ago",
+  "hours-ago" : "hours ago",
+  "minutes-ago" : "minutes ago",
+  "seconds-ago" : "seconds ago",
   "years-compressed" : "years",
   "months-compressed" : "months",
   "days-compressed" : "days",
@@ -524,8 +524,8 @@
   "email-farewell": "Be well and keep in touch,",
   "email-modified-vote": "a modified vote",
   "username-already-exists": "Username already exists.",
-  "profile-tag-title": "{{user}}'s profile on {{collective}}.",
-  "profile-tag-description": "Proposed ideas, delegations and votes by {{user}} on {{collective}}.",
+  "profile-tag-title": "{{user}} activity.",
+  "profile-tag-description": "Proposals by {{user}}.",
   "vote-tag-title": "Posted on {{collective}}.",
   "vote-tag-ballot-title": "Vote on {{collective}}.",
   "hashtag-tag-title": "{{hashtag}} posts on {{collective}}.",
@@ -716,15 +716,15 @@
   "duration": "Duration",
   "blockchain-time-closing-criteria": "Poll ends when <strong>{{blockchain}}</strong> reaches a cycle of <strong>{{height}}</strong> cycles estimated on <strong>{{date}}</strong>.",
   "blockchain-time-always-on": "This poll never ends and tallies an ongoing result.",
-  "countdown-expiration": "Poll ends in {{days}} {{hours}} (in {{blocks}})",
-  "countdown-queue": "Poll will begin in {{days}} {{hours}} (in {{blocks}})",
-  "countdown-grace": "Grace period ends in {{days}} {{hours}} (in {{blocks}})",
+  "countdown-expiration": "Poll ends in {{days}} {{hours}}.",
+  "countdown-queue": "Poll will begin in {{days}} {{hours}}.",
+  "countdown-grace": "Grace period ends in {{days}} {{hours}}.",
   "countdown-process": "Proposal is ready to be processed.",
   "periods-compressed": "cycles",
   "periods-singular": "cycle",
   "blocks-compressed": "blocks",
   "blocks-singular": "block",
-  "poll-closed-after-time": "Poll ended after {{days}} (at cycle {{height}})",
+  "poll-closed-after-time": "Poll ended after {{days}}.",
   "poll-never-ends": "This poll never ends (always on).",
   "height-compressed": "blocks",
   "height-singular": "block",
@@ -768,8 +768,10 @@
   "moloch-process": "Ready for processing",
   "moloch-period": "Period",
   "moloch-results": "Results",
-  "moloch-map-submit-proposal": "<root><description json='{{details}}'></description> <request quantity='{{sharesRequested}}' token='MOLOCH'></request> <user _id='{{applicantId}}' username='{{applicant}}'></user> <tribute quantity='{{ether tokenTribute}}' token='WETH'></tribute></root>",
-  "moloch-map-rage-quit": "<root><ragequit quantity='{{sharesToBurn}}' token='MOLOCH'></ragequit></root>",
+  "moloch-period-dao-specific": "Period of {{dao}}",
+  "moloch-results-dao-specific": "Results of {{dao}}",
+  "moloch-map-submit-proposal": "<root><description json='{{details}}'></description> <request quantity='{{sharesRequested}}' token='SHARES'></request> <user _id='{{applicantId}}' username='{{applicant}}'></user> <tribute quantity='{{ether tokenTribute}}' token='WETH'></tribute></root>",
+  "moloch-map-rage-quit": "<root><ragequit quantity='{{sharesToBurn}}' token='SHARES'></ragequit></root>",
   "moloch-yes": "Yes",
   "moloch-no": "No",
   "moloch-tribute": "Tribute to DAO",
@@ -789,7 +791,7 @@
   "moloch-period-rejected": "Rejected.",
   "moloch-period-aborted": "Aborted.",
   "syncing": "Syncing...",
-  "moloch-all": "All History",
+  "moloch-all": "History",
   "moloch-addresses": "Member addresses",
   "moloch-address": "Member address",
   "sign-out": "Sign Out",
@@ -810,6 +812,7 @@
   "moloch-alert-not-member": "The address being used to vote is not a valid member of this DAO.",
   "moloch-not-member": "Not a Member",
   "moloch-period-ragequit": "Ragequit",
+  "moloch-ragequit-short": "Quit",
   "moloch-ragequit": "Ragequit",
   "moloch-ragequit-shares-burn": "Burnt shares",
   "moloch-ragequit-funds-withdraw": "Withdrawn Funds",
@@ -837,5 +840,11 @@
   "replica-detail-unlikely-human": "🤖 Maybe robot.",
   "replica-detail-not-human": "👾 Definitely robot.",
   "replica-detail-unknown-human": "😔 Unknown score.",
-  "sign-out-prompt": "Sign out from current account?"
+  "sign-out-prompt": "Sign out from current account?",
+  "search-daos": "Search DAOs",
+  "collective-dao-title": "{{dao}} — Distributed Autonomous Organization.",
+  "collective-dao-description": "Proposals and votes from {{dao}}.",
+  "dao-proposals": "DAO Proposals.",
+  "dao-events": "DAO Events.",
+  "all-daos": "All DAOs"
 }
diff --git a/imports/api/contracts/Contracts.js b/imports/api/contracts/Contracts.js
@@ -615,6 +615,10 @@ Schema.Contract = new SimpleSchema({
     type: String,
     optional: true,
   },
+  proposalIndex: {
+    type: Number,
+    optional: true,
+  },
   didPass: {
     type: Boolean,
     optional: true,