From 22f8f3b9b1e8c089c09f2044cb0e3e8a63c08b15 Mon Sep 17 00:00:00 2001 From: viktor Date: Thu, 28 Dec 2017 16:56:57 +0300 Subject: [PATCH 1/2] date & time input for endTime field; relates to #35 --- src/components/BallotKeysMetadata.jsx | 2 +- src/components/BallotMinThresholdCard.jsx | 2 +- src/components/BallotMinThresholdMetadata.jsx | 2 +- src/components/BallotProxyCard.jsx | 2 +- src/components/BallotProxyMetadata.jsx | 2 +- src/index.js | 8 -------- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/components/BallotKeysMetadata.jsx b/src/components/BallotKeysMetadata.jsx index 1ab9e15..0fdf94d 100644 --- a/src/components/BallotKeysMetadata.jsx +++ b/src/components/BallotKeysMetadata.jsx @@ -36,7 +36,7 @@ export class BallotKeysMetadata extends React.Component {
- ballotStore.changeBallotMetadata(e, "endTime")} /> diff --git a/src/components/BallotMinThresholdCard.jsx b/src/components/BallotMinThresholdCard.jsx index 91f86c8..3c9ff0e 100644 --- a/src/components/BallotMinThresholdCard.jsx +++ b/src/components/BallotMinThresholdCard.jsx @@ -215,7 +215,7 @@ export class BallotMinThresholdCard extends React.Component { } render () { - let { commonStore, contractsStore } = this.props; + let { contractsStore } = this.props; let ballotClass = this.hideCard() ? "ballots-i display-none" : "ballots-i"; return (
diff --git a/src/components/BallotMinThresholdMetadata.jsx b/src/components/BallotMinThresholdMetadata.jsx index 639bdb3..79acc77 100644 --- a/src/components/BallotMinThresholdMetadata.jsx +++ b/src/components/BallotMinThresholdMetadata.jsx @@ -24,7 +24,7 @@ export class BallotMinThresholdMetadata extends React.Component {
- ballotStore.changeBallotMetadata(e, "endTime")} /> diff --git a/src/components/BallotProxyCard.jsx b/src/components/BallotProxyCard.jsx index f0d0a40..515d693 100644 --- a/src/components/BallotProxyCard.jsx +++ b/src/components/BallotProxyCard.jsx @@ -225,7 +225,7 @@ export class BallotProxyCard extends React.Component { } render () { - const { commonStore, contractsStore, ballotStore } = this.props; + const { contractsStore, ballotStore } = this.props; let ballotClass = this.hideCard() ? "ballots-i display-none" : "ballots-i"; return (
diff --git a/src/components/BallotProxyMetadata.jsx b/src/components/BallotProxyMetadata.jsx index ddb49f6..b733272 100644 --- a/src/components/BallotProxyMetadata.jsx +++ b/src/components/BallotProxyMetadata.jsx @@ -46,7 +46,7 @@ export class BallotProxyMetadata extends React.Component {
- ballotStore.changeBallotMetadata(e, "endTime")} /> diff --git a/src/index.js b/src/index.js index 89c2edc..4f55981 100644 --- a/src/index.js +++ b/src/index.js @@ -20,14 +20,6 @@ const routingStore = new RouterStore(); const stores = { commonStore, contractsStore, ballotStore, ballotsStore, validatorStore, routing: routingStore }; const history = syncHistoryWithStore(browserHistory, routingStore); -function generateElement(msg){ - let errorNode = document.createElement("div"); - errorNode.innerHTML = `
- ${msg} -
`; - return errorNode; -} - class AppMainRouter extends Component { constructor(props) { From c836b5f46eedf8bf0ba0aa3c1e42639957fe8f7d Mon Sep 17 00:00:00 2001 From: viktor Date: Thu, 28 Dec 2017 18:08:13 +0300 Subject: [PATCH 2/2] address autocomplete with react-places-autocomplete; relates to #34 --- package-lock.json | 14 +++++++++ package.json | 1 + public/index.html | 1 + src/components/Validator.jsx | 56 +++++++++++++++++++++++++++++++++--- src/stores/ValidatorStore.js | 2 +- 5 files changed, 69 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39261f2..33e64fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6561,6 +6561,11 @@ "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz", "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=" }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, "lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", @@ -9301,6 +9306,15 @@ "prop-types": "15.6.0" } }, + "react-places-autocomplete": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/react-places-autocomplete/-/react-places-autocomplete-5.4.3.tgz", + "integrity": "sha512-NXTYVLyYESsW5LgYlOP3+7Bs+mWeXK8KAqrht2X48+cPYFHmT/S8BNnIRUxpmZyS036s1wuItuwpCJ53nYR/zQ==", + "requires": { + "lodash.debounce": "4.0.8", + "prop-types": "15.6.0" + } + }, "react-router": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.2.0.tgz", diff --git a/package.json b/package.json index b7c9142..2baa388 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "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", diff --git a/public/index.html b/public/index.html index 0e1ce2e..742c4c3 100644 --- a/public/index.html +++ b/public/index.html @@ -20,6 +20,7 @@ Learn how to configure a non-root public URL by running `npm run build`. --> POA Network Governance DApp +