Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Feature/topic search #136

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
4f15ae2
Update README.md
MaxKaay Aug 26, 2019
4097e0a
Update README.md
MaxKaay Aug 26, 2019
271650b
Update README.md
MaxKaay Aug 26, 2019
46f27c1
Update README.md
MaxKaay Aug 26, 2019
d48ea3d
Add CI/CD
iamonuwa Aug 26, 2019
ef6a89b
Update travis branch
iamonuwa Aug 26, 2019
486bc33
Update travis branch name
iamonuwa Aug 26, 2019
8bbd884
Merge pull request #6 from iamonuwa/voting/master
johannbarbie Aug 27, 2019
389bf4f
add volt domain
johannbarbie Aug 27, 2019
1fb10cf
Merge branch 'master' of github.com:deora-earth/voting-frontend
johannbarbie Aug 27, 2019
308bc58
travis for master
johannbarbie Aug 27, 2019
f6106e7
Add CI/CD
iamonuwa Aug 26, 2019
584fb27
Merge branch 'master' into voting/master
iamonuwa Aug 29, 2019
f9c35a7
Add additional config to after deploy
iamonuwa Aug 29, 2019
4c3fced
Update README.md
MaxKaay Aug 29, 2019
c51c183
Merge pull request #8 from deora-earth/voting/master
simonweniger Aug 29, 2019
27b7803
Add jsbi package
MaxStalker Aug 29, 2019
e18e4df
Change title and add font in header
MaxStalker Aug 29, 2019
42e958b
Refactor plasma method to be more generic
MaxStalker Aug 29, 2019
7d00325
Add assets from mockups
MaxStalker Aug 29, 2019
3a9ad15
Add volt branded colors
MaxStalker Aug 29, 2019
0af7949
Add utility methods used in interactions with contracts
MaxStalker Aug 29, 2019
8c7d148
Add hardcoded proposal
MaxStalker Aug 29, 2019
283e99e
Add SparseMerkleTree library
MaxStalker Aug 29, 2019
89999f3
Add bytecode and abi for VoteBooth contract
MaxStalker Aug 29, 2019
5eb5126
Create VOLT specific config
MaxStalker Aug 29, 2019
6c3dc8d
Create components for Vote Controls
MaxStalker Aug 29, 2019
076116a
Create components for Receipt view
MaxStalker Aug 29, 2019
348425e
Create Progress component
MaxStalker Aug 29, 2019
61f56b8
Create basic Header component that will consume passed props
MaxStalker Aug 29, 2019
0980f59
Create some Common components that are use in other components
MaxStalker Aug 29, 2019
6ea8ad4
Refactor App.js
MaxStalker Aug 29, 2019
ad1d4fa
Merge branch 'master' into feature/basic-vote-screen
MaxStalker Aug 29, 2019
0f60b4d
Big initial update (#14)
MaxStalker Sep 2, 2019
904c2d2
Proposal view (#16)
sunify Sep 4, 2019
21fceb9
Feature - Address in menu (#23)
MaxStalker Sep 4, 2019
753d58c
Move all sorting/filtering logic into MainPage component (#24)
sunify Sep 5, 2019
476869e
Feature - Vote withdrawal (#17)
MaxStalker Sep 5, 2019
a429c6d
Fix layout issues (#36)
sunify Sep 5, 2019
a9be1c9
Fix broken voting (#35)
MaxStalker Sep 5, 2019
9758964
feat: select random LEAP and VOT utxos for spendies
troggy Sep 5, 2019
202007c
Merge pull request #33 from deora-earth/feat/use-random-utxos
troggy Sep 5, 2019
746fa27
Show real topics
sunify Sep 5, 2019
c7e9dbc
Update src/volt/components/ProposalsList/SingleProposal/styles.js
sunify Sep 5, 2019
757a929
:shrug:
sunify Sep 5, 2019
ac795d5
Merge pull request #39 from deora-earth/fix/topics
MaxStalker Sep 5, 2019
3511bf0
Feature - Settings screen (#46)
MaxStalker Sep 5, 2019
5e8be85
Feature - Show errors in ui (#52)
MaxStalker Sep 5, 2019
01975e3
check card in sync (#51)
johannbarbie Sep 5, 2019
ae6dc86
fix: Cannot set property '0' of null (#54)
troggy Sep 5, 2019
bdb9cc8
fix: vote fails if tree is already in local storage
troggy Sep 5, 2019
b0fe6c4
Merge pull request #57 from deora-earth/fix/proposal-id-1
troggy Sep 5, 2019
bc6f166
feat: proper proposals (#59)
troggy Sep 5, 2019
5308e20
fix: don't swallow error logs (#60)
troggy Sep 5, 2019
f3968a8
Wrap App withRouter HOC and use history prop for redirection
MaxStalker Sep 5, 2019
e6c2149
Merge pull request #63 from deora-earth/fix/empty-first-launch
troggy Sep 5, 2019
5d5b276
set max to 25 (#61)
johannbarbie Sep 5, 2019
32f6ac2
Basic results page (#65)
sunify Sep 5, 2019
78a49dc
fix: nake Burn PK button work
troggy Sep 5, 2019
acaf5b6
semicolons
troggy Sep 5, 2019
d928660
Merge pull request #79 from deora-earth/feat/burn
troggy Sep 5, 2019
f3c0a0a
fix: show nicer message on VmError
troggy Sep 6, 2019
1118f66
Feat - New tab icon (#76)
MaxStalker Sep 6, 2019
951fb18
Apply suggestions from code review
troggy Sep 6, 2019
e0574c4
Merge pull request #81 from deora-earth/feat/better-spendie-error-han…
troggy Sep 6, 2019
9c7b3f6
feat: consolidate voter's VOC (#47)
troggy Sep 6, 2019
0530cbb
Request balances for result page in batch (#88)
sunify Sep 6, 2019
aacd74d
fix: prevent 'Too many inputs' (#93)
troggy Sep 6, 2019
15bb244
final Proposals (#96)
johannbarbie Sep 6, 2019
76ff3c2
Revert "final Proposals (#96)"
johannbarbie Sep 6, 2019
0f99c01
Add Deora logo to public folder
MaxStalker Sep 6, 2019
7c73ef0
Import logo from root folder
MaxStalker Sep 6, 2019
f275cd4
Add Loader component
MaxStalker Sep 6, 2019
5c43fdc
Adjust styles for initial load
MaxStalker Sep 6, 2019
ff5f081
Update votes in App state on successful submit vote or withdrawal
MaxStalker Sep 6, 2019
665f0cc
Drill down userVotes prop and proposal votes
MaxStalker Sep 6, 2019
f239180
Store and update userVotes in App store
MaxStalker Sep 6, 2019
7b49d68
Enable smooth scrolling on mobile. Resolves #87
MaxStalker Sep 6, 2019
d9fbd78
Merge pull request #105 from deora-earth/fix/87-smooth-scrolling
troggy Sep 6, 2019
95d2ad2
Fix - Responsive menu (#101)
MaxStalker Sep 6, 2019
dd16391
Merge pull request #104 from deora-earth/fix/102-background-and-loader
troggy Sep 6, 2019
50c622c
feat: show submitted votes on a voting screen (#84)
troggy Sep 6, 2019
26afde2
Merge branch 'master' into fix/37-display-number-of-votes
troggy Sep 6, 2019
a5c84f0
Add global error handler (#98)
vrde Sep 6, 2019
a059afd
fix incorrect merge
troggy Sep 6, 2019
bba195b
flooring the points
troggy Sep 6, 2019
a28dd34
Poll proposals all 5 mins and enable/disable voting button (#103)
TimDaub Sep 6, 2019
20ecc55
Merge branch 'master' into fix/37-display-number-of-votes
johannbarbie Sep 6, 2019
830661f
update package-lock.json
troggy Sep 6, 2019
86cd0bc
Merge pull request #106 from deora-earth/fix/37-display-number-of-votes
troggy Sep 6, 2019
d7ecf85
fix: set color for browser header to Volt Main (#107)
troggy Sep 6, 2019
4e1f891
fix: possible error in sparse merkle tree (#110)
troggy Sep 6, 2019
4701abc
better error for tree out of sync (#108)
johannbarbie Sep 6, 2019
4119731
Fix sorting in list view (#109)
MaxStalker Sep 6, 2019
ba7e728
fix results url
johannbarbie Sep 6, 2019
e01cfca
Merge pull request #113 from deora-earth/fix/resultsUrl
MaxKaay Sep 6, 2019
51788fa
fix: invalid UTXO selection because of negative amount
troggy Sep 6, 2019
0339afe
BNify
troggy Sep 6, 2019
a3cf826
VOT by factor 18
troggy Sep 6, 2019
211e3c8
Shrink vote controls
vrde Sep 6, 2019
14d7d63
Fix spacing
vrde Sep 6, 2019
1712b1b
Fix spacing issue
vrde Sep 6, 2019
25ce43f
Fix #112
vrde Sep 6, 2019
6b71180
Fix margin
vrde Sep 6, 2019
c18e0df
Merge pull request #111 from deora-earth/fix/voting-slider
MaxStalker Sep 6, 2019
6e270fd
Merge pull request #114 from deora-earth/fix/proper-input-selection
troggy Sep 6, 2019
aae86f0
Fix - Remove footer. Adjust spacing (#115)
MaxStalker Sep 6, 2019
75991c5
feat: disable partial withdrawals + additions (#116)
troggy Sep 6, 2019
6a040fe
Withdrawal receipt (#117)
MaxStalker Sep 6, 2019
3cc9192
Disable block parsing. Slowdown polling by 1s
MaxStalker Sep 6, 2019
123e177
fix: disable vote controls if user has no credits
troggy Sep 6, 2019
a6eecc8
Add Google Analytics
MaxStalker Sep 6, 2019
c0f049d
final Proposals (#96) (#121)
johannbarbie Sep 6, 2019
8197ff9
Merge pull request #119 from deora-earth/fix/26-no-credit-no-vote
troggy Sep 6, 2019
6b799b1
fix: show human-readable message when no balance card
troggy Sep 6, 2019
0efbc1f
Merge pull request #123 from deora-earth/fix/73-no-balance-card
troggy Sep 6, 2019
35da6d5
Merge pull request #120 from deora-earth/feat/add-google-analytics
simonweniger Sep 7, 2019
efd233c
Merge pull request #118 from deora-earth/radical-fix/short-fuse-parse…
simonweniger Sep 7, 2019
dd562a3
chore: hide settings, still accessible by URL
troggy Sep 7, 2019
24740db
Merge pull request #127 from deora-earth/fix/hide-settings
simonweniger Sep 7, 2019
9a90a32
feat: hide vote controls on click elsewhere (#128)
troggy Sep 7, 2019
81f3394
feat: yes/no buttons increase vote (#126)
troggy Sep 7, 2019
674c3b9
Add Redirect for unknown routes (#122)
MaxStalker Sep 7, 2019
31b9761
More space for smaller screens (#129)
sunify Sep 7, 2019
0f8d990
Display max number of credits equal to number of filled proposals (#125)
MaxStalker Sep 7, 2019
2152d7e
Include proposal topics in search
sunify Sep 7, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
language: node_js

node_js:
- "8.11"

before_install:
- pip install --user awscli
- export PATH=$PATH:$HOME/.local/bin

install: npm i

script:
- unset CI
- npm run build

cache: npm

deploy:
- provider: s3
cache_control: "max-age=31536000"
access_key_id: $aws_access_key_id
secret_access_key: $aws_secret_access_key
bucket: $prod_s3_bucket
acl: public_read
local_dir: build
skip_cleanup: true
region: "eu-west-1"
on:
branch: master

after_deploy:
- aws configure set aws_access_key_id $aws_access_key_id
- aws configure set aws_secret_access_key $aws_secret_access_key
- aws configure set preview.cloudfront true
- aws cloudfront create-invalidation --distribution-id $PROD_CLOUDFRONT_DISTRIBUTION --paths "/*"
52 changes: 10 additions & 42 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
# 🌍 Planet A 🌍
# deora.earth :earth_africa:

Planet A is a "serious social game" taking place during the Berlin Blockchain Week 2019 and CCCamp 2019 involving as many participants as possible.
deora.earth is a universal white-label voting and community platform.

The game will begin as a gimmick incentivizing participants through a financial incentive to interact with each other via a burner wallet. Half way through the game, players will find themselves in a tragedy of the commons, as they find out that their greedy interactions had dangerous emissions that now threaten to collapse the economy of Berlin Blockchain Week. They enter as teams into a competition to educate each other, and prevent an economic tipping points to be reached. The team that manages to achieve the best climate score wins the event.
We build an universal decision making/lobby tool for communities, NGOs, political movements and for everyone who wants to organize themselves. Together with other blockchain voting initiatives and foundations we want to give the voice back to the people. We are using hands-on blockchain solutions for current real offline voting & community organizing challenges.

For our first version - used for projects of closed events/environments and decision making processes - we are utilizing the burner wallet together with the Leap Network, a Plasma implementation on Ethereum.

## Installation

The Planet A Wallet runs on LeapDAO's test network. Installation should be
The wallet runs on LeapDAO's test network. Installation should be
simple and straight forward:

```bash
$ git clone https://github.com/social-dist0rtion-protocol/planet-a.git
$ git
$ npm i
$ npm run start
```
Expand All @@ -25,48 +27,14 @@ $ HTTPS=true npm run start
## Components

### ERC20 Tokens
- LeapToken (LEAP)
- decimals: 18
- address: [`0xD2D0F8a6ADfF16C2098101087f9548465EC96C98`](https://testnet.leapdao.org/explorer/address/0xD2D0F8a6ADfF16C2098101087f9548465EC96C98)
- purpose: to pay the execution of the smart contract.
- CO2 (CO2)
- decimals: 18
- unit: Gigaton of CO₂
- addresss: [`0xF64fFBC4A69631D327590f4151B79816a193a8c6`](https://testnet.leapdao.org/explorer/address/0xF64fFBC4A69631D327590f4151B79816a193a8c6)
- purpose: reserve of CO₂ that is released to `Air`. CO₂ cannot be created out of thin air (eheheh), so the contract needs to be preloaded with a big amount of CO₂.
- Goellars (GOE)
- decimals: 18
- address: [`0x1f89Fb2199220a350287B162B9D0A330A2D2eFAD`](https://testnet.leapdao.org/explorer/address/0x1f89Fb2199220a350287B162B9D0A330A2D2eFAD)
- purpose: reserve of Göllars to distribute to players on successful handshake.

### ERC1948 Tokens
Passports are ERC1948 tokens. Each player needs at least one passport to play.

Passport data structure:

```
+------------+------------+------------+-------------+
| 20 bytes | 4 bytes | 4 bytes | 4 bytes |
| name str | picId | CO₂ locked | CO₂ emitted |
+------------+------------+------------+-------------+
```
### ERC1948 Tokens
`

Note that the CO₂ value in the passport is expressed in Megatons.

### Smart Contracts
The [planet-a-contracts](https://github.com/social-dist0rtion-protocol/planet-a-contracts) repository contains:
- `Earth`: smart contract that handles the handshake function and releases CO₂ to `Air`, and Göllars to the players.
- `Air`: smart contact that accumulates CO₂. It exposes the `plantTree` function to lock CO₂ back to `Earth`.

#### Earth
`Earth` needs:
- LeapToken
- CO2
- Goellars

#### Air
`Air` needs:
- LeapToken


## License

Expand Down
Loading