Skip to content

Commit

Permalink
Competition improvementx, xdai support (#1362)
Browse files Browse the repository at this point in the history
* update docker-compose

* get rid of floats and margins for positioning in card

* hook up to actual executed Competition proposals

* work-around out-of-memory in webpack.dev.server

* complete details html

* upgrade subgraph version

* fixed solutions row css

* improvements to Card

* more Card improvements

* StatusBlob, css, links to client, tz datetimes

* more in Details

* implement create solution action

* better solutions table css

* blue border on selected solution

* more on solution details, other css

* a little more niceness in Details

* connected solution vote to client lib

* new proposal expectation text

* more proposal expectation text

* Solution => Suggestion

* more Solution=> Submission

* add spacing between cards

* UI improvements and bug fixes for submshn details

* more layout improvements

* cleanup up schemeContainer layout a bit

* pull in latest client lib

* refactor suggestions queries, get splits

* show user voted in details

* detect whether current user voted in Subm Details

* fix title and description on create

* fix hang on competitions having 0 submissions

* fix time options

* ui taeaks, added Redeem

* avoid clipping of user account popup

* Alter logic for showing voting countdown

* clean up schemecontainer layout

* refactor modularity pattern

* add Go To Competition link to ProposalDetails

* supply dynamic crx contract name in utils

* refactor to get crx rewarder name synchronously

* a little cleanup refactoring

* lint

* scroll bars for create proposal modal

* remove obsolete comment

* fix suggestor account profile

* fix breadcrumbs

* fix breadcrumbs

* fix display of voting countdown

* fix card clipping on bottom with very long title

* spacing tweak

* add date picker

* fix date picker

* add time picker

* update competion proposal validation

* submission details from url

* fix createproposal lint errors

* use client 0.2.39

* fix reward split validation

* update date-time picker

* remove console log

* tweaks to date picker layout

* use client 0.2.40

* handle no submissions, css tweaks

* enable use of proposal.scheme

* update addresses, use latests test_env images

* support for displaying submission tags

* fix compile error, nowrap account names

* add voting period countdown

* fix huge url layout problem

* fix validation error not showing

* Rename inputs

* add some more date time validations

* fix lint error

* no-winners text, auto update UI on phase changes

* fix no winners text

* add submissions to start countdown

* to redeem, check if proposal is redeemed

* use cleint 0.2.41

* start on winning voters

* tweak creator css

* more for isWinner

* more on votes

* show competition end datetime in card

* winners feedback on cards

* lint

* use latest test_env images

* fix dependency error

* better subscriptions, little tweaks

* refactor utils.getSubmissions

* new subgraph, more refactoring, fixes, changes

* status changes

* reenable tags

* add CompetitionVote.search by competition

* variable name correction

* fix compile error

* try for fixing repfromtoken

* fix rep redeem for privateKey case

* fix submission creator account

* fix thumbsup icon tooltip

* fix compile error

* add needed subscriptions for SubDetails

* fix bug that crashes competition page

* fix compile error

* update test code

* make staging code build not run out of memory

* nicer vote button

* automatically update status in SubmissionDetails

* fix compile error

* show competition regardless of passed or executed

* restrict redeem button just on GP redemptions

* fix compile error

* handle no logged-in account

* gate new submissions until proposal is executed

* xperiment

* another try to fix wrap

* clean up subdetails layout a little when sparse

* show countdown when inbetween subm and voting

* fix submission row corner styling

* better wrapping on rep in right section

* upgrade to client 2.44

* fix submissions query

* use masterrinkeby

* add scrollbar to description

* replaced datepicker

* comp start time should be shown as required

* try at test fix

* css fixes

* fix automated test

* show rep as percentage

* first phase of Competition card sorting

* more efficient fetching of status by Cards

* removed lint disably thing

* a little code cleanup

* sort tied cards by stage dates

* add CountdownText component

* fix package errors that break the build

* merge dev

* a couple requested text changes

* countdown styling

* status tracking issues, refactor account votes

* subm created date.  triangle for current phase

* more improvements to status logic

* max width of images in subscription descriptions

* start on createproposal mobility

* use grid css to align in createproposal modal

* tweak CreateProposal CSS

* more mobile

* use fr units

* start on switching submissions list to grid

* remove comments, lint warnings

* start on mobile detais/submissions

* undo false start

* more mobility in details

* fix compile error

* upgrade client to latest migration

* update ganache subgraph

* use vote.submission

* capture votes.  proposerIsAdmin, customBeneficiary

* remove comments

* mobilize the submissions list

* SubmissionDetails mobility

* merge add'l dev change

* better bluebuttons

* more submissionDetal mobility

* mobilize create submission modal

* wording change

* no scroll description when no submissions

* the merge fixes that I forgot to commit earlier

* new datetime calendar

* fix tests ( :-D !)

* IStateProps=>IState

* IExternalStateProps=>IExternalState

* classname import

* added comments

* cleanup changelog.md

* add braces

* statusblob comment

* removed comments

* more changelog

* fixing mixpanel base url passing

* fix mixpanel problems (hopefully)

* undo changes that should not have been committed

* lint

* add comment in moment-timezone

* show beneficiary instead of suggester

* Fix staking errors

Get staking working
Make sure error doesnt overlap amount needed to boost text

Fixes: #1350

* mobile glitch at bottom of subm det on iPhone 5

* mobiliity tweaks

* restore submission details url

* add disqus to submission details (#1358)

* add disqus to submission details
* use submission, not proposal, title

* web3connect/burnerwallet (#1353)

* forgot to commit package.json

* validate for invalid datetime formatting

* add disqus to CompetitionDetails

* xdai support (#1372)

* tweaks to help disqus

* remove disqus from submission details

* nicer formating on submissions heading

* tweak width of winners badge

* tweak redeem button

* fix xdai settings

* fix mainnet connection identifier

* start on high-level caching

* supress build dev errors

* set correct xdai endpoints

* optimize getSubmission

* optimize getCompetitionVotes

* more preparation of queries for caching

* removed redundant code

* upgrade xdao subgraph to v37_3_xdai

* added a comment

* upgrade burnerwallet

* When on xdai network ETH becomes xDAI and GEN becomes xGEN (#1380)

* show only registred daos in xdai network

* new xDao subgraph

* fix tokens.json for production

* lint

* disable new submission button and show tooltip

* add torus web provider

* prevent new submission click when disabled

* undo add Torus

* switch to absolute rep from percentage

* fix compile errors

Co-authored-by: Doug Kent <[email protected]>
Co-authored-by: Shivani <[email protected]>
Co-authored-by: Tibet Sprague <[email protected]>
  • Loading branch information
4 people authored Feb 10, 2020
1 parent 7e21030 commit a1cc527
Show file tree
Hide file tree
Showing 28 changed files with 823 additions and 619 deletions.
129 changes: 88 additions & 41 deletions data/tokens.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,94 @@
{
"0x6b175474e89094c44da98b954eedeac495271d0f": {
"decimals": 18,
"name": "Dai Stablecoin",
"symbol": "DAI"
"ganache": {
"baseTokenName": "ETH",
"genName": "GEN",
"tokens": {}
},
"0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359": {
"decimals": 18,
"name": "Sai Stablecoin v1.0",
"symbol": "SAI"
"main": {
"baseTokenName": "ETH",
"genName": "GEN",
"tokens": {
"0x6b175474e89094c44da98b954eedeac495271d0f": {
"decimals": 18,
"name": "Dai Stablecoin",
"symbol": "DAI"
},
"0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359": {
"decimals": 18,
"name": "Sai Stablecoin v1.0",
"symbol": "SAI"
},
"0x056fd409e1d7a124bd7017459dfea2f387b6d5cd": {
"decimals": 2,
"name": "Gemini dollar",
"symbol": "GUSD"
},
"0xdd974d5c2e2928dea5f71b9825b8b646686bd200": {
"decimals": 18,
"name": "KyberNetwork",
"symbol": "KNC"
},
"0x8e870d67f660d95d5be530380d0ec0bd388289e1": {
"decimals": 18,
"name": "Paxos Standard",
"symbol": "PAX"
},
"0x0000000000085d4780B73119b644AE5ecd22b376": {
"decimals": 18,
"name": "TrueUSD",
"symbol": "TUSD"
},
"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": {
"decimals": 6,
"name": "USD Coin",
"symbol": "USDC"
},
"0xdac17f958d2ee523a2206206994597c13d831ec7": {
"decimals": 6,
"name": "Tether USD",
"symbol": "USDT"
},
"0xCc80C051057B774cD75067Dc48f8987C4Eb97A5e": {
"decimals": 18,
"name": "Nectar",
"symbol": "NEC"
}
}
},
"0x056fd409e1d7a124bd7017459dfea2f387b6d5cd": {
"decimals": 2,
"name": "Gemini dollar",
"symbol": "GUSD"
"rinkeby": {
"baseTokenName": "ETH",
"genName": "GEN",
"tokens": {
"0x6f2d6ff85efca691aad23d549771160a12f0a0fc": {
"decimals": 18,
"name": "Dai Stablecoin",
"symbol": "DAI"
},
"0x811e5cc5fddd395d488fe92c4f0f917f3ada6ab6": {
"decimals": 18,
"name": "Sai Stablecoin v1.0",
"symbol": "SAI"
},
"0x6cbe14d7af0fc86c59f125c6506817d91d412582": {
"decimals": 2,
"name": "Gemini dollar",
"symbol": "GUSD"
},
"0x9f13dbe2ef9733a4bb580412e9cb6f463e9bdf1a": {
"decimals": 18,
"name": "KyberNetwork",
"symbol": "KNC"
},
"0x9be1001d601102ae0f24ab4764dd5ce2f3e5b096": {
"decimals": 6,
"name": "USD Coin",
"symbol": "USDC"
}
}
},
"0xdd974d5c2e2928dea5f71b9825b8b646686bd200": {
"decimals": 18,
"name": "KyberNetwork",
"symbol": "KNC"
},
"0x8e870d67f660d95d5be530380d0ec0bd388289e1": {
"decimals": 18,
"name": "Paxos Standard",
"symbol": "PAX"
},
"0x0000000000085d4780B73119b644AE5ecd22b376": {
"decimals": 18,
"name": "TrueUSD",
"symbol": "TUSD"
},
"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": {
"decimals": 6,
"name": "USD Coin",
"symbol": "USDC"
},
"0xdac17f958d2ee523a2206206994597c13d831ec7": {
"decimals": 6,
"name": "Tether USD",
"symbol": "USDT"
},
"0xCc80C051057B774cD75067Dc48f8987C4Eb97A5e": {
"decimals": 18,
"name": "Nectar",
"symbol": "NEC"
"xdai": {
"baseTokenName": "xDAI",
"genName": "xGEN",
"tokens": {}
}
}
Loading

0 comments on commit a1cc527

Please sign in to comment.