Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dot voting demo fixes #1176

Merged
merged 5 commits into from Aug 23, 2019
Merged

Dot voting demo fixes #1176

merged 5 commits into from Aug 23, 2019

Conversation

rkzel
Copy link
Collaborator

@rkzel rkzel commented Aug 18, 2019

All the fixes and small changes DV got in preparation for being demoed. VoteContent panel moved from Decision one level up, to App itself, to exist outside of AppView and behave like a good panel should, not competing against header for visibility. Sliders are now 100% width, so responsiveness is better, always adjusting to panel's width correctly. Display of tokens and percentages per option was also slightly adjusted. This code is now running on staging and rinkeby, therefore should be merged without changes (if any are necessary, should be done within a separate ticket/PR).

@rkzel rkzel requested review from a team as code owners August 18, 2019 20:57
@ghost ghost requested review from topocount and ottodevs and removed request for a team August 18, 2019 20:57
chadoh
chadoh previously approved these changes Aug 20, 2019
Copy link
Collaborator

@chadoh chadoh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks mostly good. I have some small concerns below, and one big concern around date-fns. However, given that this is currently working in our deployed environment, I think we should go with what you have here. I'll work on getting date-fns added to the root package.json (as in the discussions branch) in a separate pull request, in which I'll revert your changes to capitalize all those D's and Y's.

apps/dot-voting/app/App.js Show resolved Hide resolved
apps/dot-voting/app/Decisions.js Outdated Show resolved Hide resolved
apps/dot-voting/app/Decisions.js Outdated Show resolved Hide resolved
apps/dot-voting/app/components/Card/Vote.js Show resolved Hide resolved
@rkzel rkzel merged commit d19d263 into dev Aug 23, 2019
@chadoh chadoh deleted the dot-voting-demo-fixes branch August 23, 2019 20:06
chadoh added a commit that referenced this pull request Aug 24, 2019
* dev:
  Dot voting demo fixes (#1176)
  Discussions (#1050)
  Fix linting and remove package-lock files
chadoh added a commit that referenced this pull request Aug 24, 2019
* newstyle:
  Add a minimal EMPTY_ROLE to Discussions - This is needed to be considered an actual Aragon app by the Kernel - Reference: https://hack.aragon.org/docs/cli-dao-commands#dao-install
  Remove partial ACL guards on discussions:
  Discussions: fix typos in README examples
  Dot voting demo fixes (#1176)
  Discussions (#1050)
  Fix linting and remove package-lock files
chadoh added a commit that referenced this pull request Aug 27, 2019
* newstyle: (47 commits)
  Revert Rewards & Projects to previous aragonUI
  Dot Voting: fix issues found during QA
  Dot Voting/CastVote: fix prop type
  Revert "[DEV] rm pre-commit lint"
  Dot Voting: mv totalSupport calc to VotingResults
  Dot Voting/VoteDetails: mv Participation
  Dot Voting/CastVote: rm tokenData; keep userBalance
  Dot Voting: define tokenContract in CastVote
  Dot Voting: mv CastVote to own file
  Dot Voting/VoteDetails: mv VoteEnact & VotingResults
  Add a minimal EMPTY_ROLE to Discussions - This is needed to be considered an actual Aragon app by the Kernel - Reference: https://hack.aragon.org/docs/cli-dao-commands#dao-install
  Remove partial ACL guards on discussions:
  Discussions: fix typos in README examples
  Dot voting demo fixes (#1176)
  Dot Voting/VoteDetails: mv DescriptionAndCreator
  Discussions (#1050)
  Dot Voting/VoteDetails: mv Title to own file
  Dot Voting/VoteDetail: mv Status to new file
  Dot Voting/VoteDetails: mv AppBadge to new file
  [DEV] rm pre-commit lint
  ...
chadoh added a commit that referenced this pull request Aug 27, 2019
* newstyle: (36 commits)
  Upgrade date fns (#1188)
  upgrade Rewards ADS UI (#1187)
  Aragon DS upgrade: addressbook (#1156)
  Revert Rewards & Projects to previous aragonUI
  Dot Voting: fix issues found during QA
  Dot Voting/CastVote: fix prop type
  Revert "[DEV] rm pre-commit lint"
  Dot Voting: mv totalSupport calc to VotingResults
  Dot Voting/VoteDetails: mv Participation
  Dot Voting/CastVote: rm tokenData; keep userBalance
  Dot Voting: define tokenContract in CastVote
  Dot Voting: mv CastVote to own file
  Dot Voting/VoteDetails: mv VoteEnact & VotingResults
  Add a minimal EMPTY_ROLE to Discussions - This is needed to be considered an actual Aragon app by the Kernel - Reference: https://hack.aragon.org/docs/cli-dao-commands#dao-install
  Remove partial ACL guards on discussions:
  Discussions: fix typos in README examples
  Dot voting demo fixes (#1176)
  Dot Voting/VoteDetails: mv DescriptionAndCreator
  Discussions (#1050)
  Dot Voting/VoteDetails: mv Title to own file
  ...
chadoh added a commit that referenced this pull request Aug 28, 2019
* dev: (39 commits)
  Projects: revert to old aragonUI version
  Projects: mv AppTitleButton
  Dot Voting/date-fns: use v2 formatting strings
  Upgrade date fns (#1188)
  upgrade Rewards ADS UI (#1187)
  Aragon DS upgrade: addressbook (#1156)
  Revert Rewards & Projects to previous aragonUI
  Dot Voting: fix issues found during QA
  Dot Voting/CastVote: fix prop type
  Revert "[DEV] rm pre-commit lint"
  Dot Voting: mv totalSupport calc to VotingResults
  Dot Voting/VoteDetails: mv Participation
  Dot Voting/CastVote: rm tokenData; keep userBalance
  Dot Voting: define tokenContract in CastVote
  Dot Voting: mv CastVote to own file
  Dot Voting/VoteDetails: mv VoteEnact & VotingResults
  Add a minimal EMPTY_ROLE to Discussions - This is needed to be considered an actual Aragon app by the Kernel - Reference: https://hack.aragon.org/docs/cli-dao-commands#dao-install
  Remove partial ACL guards on discussions:
  Discussions: fix typos in README examples
  Dot voting demo fixes (#1176)
  ...
chadoh added a commit that referenced this pull request Aug 28, 2019
* mainnet-audit: (54 commits)
  Projects: revert to old aragonUI version
  Projects: mv AppTitleButton
  Dot Voting/date-fns: use v2 formatting strings
  Upgrade date fns (#1188)
  upgrade Rewards ADS UI (#1187)
  Aragon DS upgrade: addressbook (#1156)
  Revert Rewards & Projects to previous aragonUI
  Dot Voting: fix issues found during QA
  Dot Voting/CastVote: fix prop type
  Revert "[DEV] rm pre-commit lint"
  Dot Voting: mv totalSupport calc to VotingResults
  Dot Voting/VoteDetails: mv Participation
  Dot Voting/CastVote: rm tokenData; keep userBalance
  Dot Voting: define tokenContract in CastVote
  Dot Voting: mv CastVote to own file
  Dot Voting/VoteDetails: mv VoteEnact & VotingResults
  Add a minimal EMPTY_ROLE to Discussions - This is needed to be considered an actual Aragon app by the Kernel - Reference: https://hack.aragon.org/docs/cli-dao-commands#dao-install
  Remove partial ACL guards on discussions:
  Discussions: fix typos in README examples
  Dot voting demo fixes (#1176)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants