poanetwork
/
poa-dapps-voting
mirror of https://github.com/poanetwork/poa-dapps-voting.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'core' into feature/#187-new-style-for-xdai-network 

* core:
  fix package.json
  Fix packages
  change versions of npm packages for adding to poa-test-setup as npm package
This commit is contained in:
Gabriel Rodriguez Alsina 2018-12-20 11:00:18 -03:00
parent 98e52932da 6be5b5fb04
commit a2fc1a466b
5 changed files with 4638 additions and 7001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11505
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

104
package.json
View File

@ -7,53 +7,60 @@
"ajv": "6.5.2",
"autoprefixer": "7.1.6",
"babel-core": "6.26.3",
"babel-eslint": "7.2.3",
"babel-jest": "23.2.0",
"babel-loader": "7.1.4",
"babel-plugin-transform-decorators-legacy": "^1.3.5",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.1.2",
"babel-preset-stage-1": "^6.24.1",
"babel-plugin-transform-decorators-legacy": "1.3.5",
"babel-polyfill": "6.26.0",
"babel-preset-es2015": "6.24.1",
"babel-preset-react": "6.24.1",
"babel-preset-react-app": "3.1.2",
"babel-preset-stage-1": "6.24.1",
"babel-runtime": "6.26.0",
"case-sensitive-paths-webpack-plugin": "2.1.2",
"chalk": "2.4.1",
"css-loader": "0.28.11",
"dotenv": "4.0.0",
"eslint-config-prettier": "^2.9.0",
"eslint": "4.1.1",
"eslint-config-prettier": "2.9.0",
"eslint-config-react-app": "2.1.0",
"eslint-loader": "1.9.0",
"eslint-plugin-dependencies": "^2.4.0",
"eslint-plugin-prettier": "^2.6.2",
"eslint-plugin-dependencies": "2.4.0",
"eslint-plugin-flowtype": "2.34.1",
"eslint-plugin-import": "2.6.0",
"eslint-plugin-jsx-a11y": "5.1.1",
"eslint-plugin-prettier": "2.6.2",
"eslint-plugin-react": "7.1.0",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "1.1.5",
"fs-extra": "3.0.1",
"gh-pages": "^1.2.0",
"gh-pages": "1.2.0",
"html-webpack-plugin": "2.29.0",
"jest": "20.0.4",
"mobx": "^3.4.1",
"mobx-react": "^4.3.5",
"mobx-react-devtools": "^4.2.15",
"mobx-react-router": "^4.0.1",
"moment": "^2.20.1",
"mobx": "3.4.1",
"mobx-react": "4.3.5",
"mobx-react-devtools": "4.2.15",
"mobx-react-router": "4.0.1",
"moment": "2.20.1",
"node-sass-chokidar": "1.3.0",
"nodemon": "^1.17.5",
"npm-run-all": "^4.1.2",
"nodemon": "1.17.5",
"npm-run-all": "4.1.2",
"object-assign": "4.1.1",
"postcss-flexbugs-fixes": "3.2.0",
"postcss-loader": "2.0.8",
"prettier": "^1.13.7",
"prettier": "1.13.7",
"promise": "8.0.1",
"raf": "3.4.0",
"randomhex": "^0.1.5",
"react": "^16.2.0",
"react-dev-utils": "^4.2.1",
"react-dom": "^16.2.0",
"react-places-autocomplete": "^5.4.3",
"react-router-dom": "^4.2.2",
"react-select": "^1.1.0",
"randomhex": "0.1.5",
"react": "16.2.0",
"react-dev-utils": "4.2.1",
"react-dom": "16.2.0",
"react-places-autocomplete": "5.4.3",
"react-router-dom": "4.2.2",
"react-select": "1.1.0",
"style-loader": "0.19.0",
"sw-precache-webpack-plugin": "0.11.5",
"sweetalert2": "^7.0.8",
"sweetalert2": "7.0.8",
"url-loader": "0.6.2",
"web3": "1.0.0-beta.34",
"webpack": "3.12.0",
@ -106,50 +113,5 @@
"jsx",
"node"
]
},
"babel": {
"presets": [
"react-app"
]
},
"eslintConfig": {
"extends": [
"react-app",
"plugin:prettier/recommended"
],
"plugins": [
"dependencies"
],
"rules": {
"no-control-regex": 0,
"dependencies/no-cycles": "error",
"dependencies/no-unresolved": [
"error",
{
"ignore": [
"web3"
]
}
]
},
"settings": {
"import/resolver": {
"node": {
"extensions": [
".js",
".jsx"
]
}
}
}
},
"devDependencies": {
"babel-eslint": "^7.2.3",
"eslint": "^4.10.0",
"eslint-config-react-app": "^2.1.0",
"eslint-plugin-flowtype": "^2.46.1",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-plugin-react": "^7.7.0"
}
}

3
src/components/BallotEmissionFundsMetadata.jsx
View File

@ -110,7 +110,8 @@ export class BallotEmissionFundsMetadata extends React.Component {
Current balance of 
<a href={explorerLink} target="_blank">
EmissionFunds contract
</a>.
</a>
.
</p>
</div>
</div>

15
src/components/BallotKeysMetadata.jsx
View File

@ -31,7 +31,9 @@ export class BallotKeysMetadata extends React.Component {
onChange={e => ballotStore.changeBallotMetadata(e, 'newVotingKey', 'ballotKeys')}
/>
<p className="hint">
Voting key address of new validator.<br />Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
Voting key address of new validator.
<br />
Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
</p>
</div>
</div>
@ -45,7 +47,9 @@ export class BallotKeysMetadata extends React.Component {
onChange={e => ballotStore.changeBallotMetadata(e, 'newPayoutKey', 'ballotKeys')}
/>
<p className="hint">
Payout key address of new validator.<br />Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
Payout key address of new validator.
<br />
Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
</p>
</div>
</div>
@ -68,7 +72,8 @@ export class BallotKeysMetadata extends React.Component {
{ballotStore.isNewValidatorPersonalData
? 'Mining key address of new validator.'
: 'Affected key address of validator to vote for.'}
<br />Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
<br />
Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
</p>
</div>
</div>
@ -84,7 +89,9 @@ export class BallotKeysMetadata extends React.Component {
disabled={ballotStore.isNewValidatorPersonalData}
/>
<p className="hint">
Mining key address of validator to vote for.<br />Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
Mining key address of validator to vote for.
<br />
Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
</p>
</div>
</div>

12
src/components/NewBallot.jsx
View File

@ -445,16 +445,20 @@ export class NewBallot extends React.Component {
<p className="info-title">Limits of the ballot</p>
<div className="info-i">
Minimum {minThreshold} from {contractsStore.validatorsLength} validators are required to pass the&nbsp;
proposal<br />
proposal
<br />
</div>
<div className="info-i">
You can create {contractsStore.validatorLimits.keys} ballot(s) for keys<br />
You can create {contractsStore.validatorLimits.keys} ballot(s) for keys
<br />
</div>
<div className="info-i">
You can create {contractsStore.validatorLimits.minThreshold} ballot(s) for consensus<br />
You can create {contractsStore.validatorLimits.minThreshold} ballot(s) for consensus
<br />
</div>
<div className="info-i">
You can create {contractsStore.validatorLimits.proxy} ballot(s) for proxy<br />
You can create {contractsStore.validatorLimits.proxy} ballot(s) for proxy
<br />
</div>
</div>
</div>