status-im/snt-voting
2
0
Fork 0
mirror of https://github.com/status-im/snt-voting.git synced 2025-02-22 23:28:07 +00:00
Code Issues Projects Releases Wiki Activity

linting and removing a console.log

Browse Source
This commit is contained in:
Richard Ramos 2019-02-09 15:41:33 -04:00
parent 7c9ed2b7b2
commit 051fe36537
3 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/flow/LandingPage.js
View File

@ -86,7 +86,7 @@ class LandingPage extends Component {
EmbarkJS.Storage.get(web3.utils.toAscii(closedPoll._description)).then(content => { EmbarkJS.Storage.get(web3.utils.toAscii(closedPoll._description)).then(content => {
closedPoll.content = JSON.parse(content); closedPoll.content = JSON.parse(content);
this.setState({closedPoll}); this.setState({closedPoll});
this.props.replacePoll(openPoll); this.props.replacePoll(closedPoll);
}) })
} }
} }

2
app/components/flow/OtherPolls.js
View File

@ -89,7 +89,7 @@ class OtherPolls extends Component {
if(i >= this.props.end) return null; if(i >= this.props.end) return null;
if(p._canceled) return null; if(p._canceled) return null;
console.log(p);
p._tokenSum = 0; p._tokenSum = 0;
p._votesSum = 0; p._votesSum = 0;
for(let i = 0; i < p._numBallots; i++){ for(let i = 0; i < p._numBallots; i++){

63
app/dapp.js
View File

@ -1,6 +1,6 @@
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import web3 from "Embark/web3" import web3 from "Embark/web3";
import EmbarkJS from 'Embark/EmbarkJS'; import EmbarkJS from 'Embark/EmbarkJS';
import PollManager from 'Embark/contracts/PollManager'; import PollManager from 'Embark/contracts/PollManager';
import Voting from './components/Voting'; import Voting from './components/Voting';
@ -8,9 +8,9 @@ import DappToken from 'Embark/contracts/DappToken';
import { VotingContext } from './context'; import { VotingContext } from './context';
import Web3Render from './components/standard/Web3Render'; import Web3Render from './components/standard/Web3Render';
import { getPolls, omitPolls } from './utils/polls'; import { getPolls, omitPolls } from './utils/polls';
import { HashRouter as Router, Route, Link, Switch } from "react-router-dom"; import { HashRouter as Router, Route, Switch } from "react-router-dom";
import OtherWallets from './components/flow/wallet/OtherWallets'; import OtherWallets from './components/flow/wallet/OtherWallets';
import Typography from '@material-ui/core/Typography' import Typography from '@material-ui/core/Typography';
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'; import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import './dapp.css'; import './dapp.css';
@ -49,9 +49,6 @@ const pollsPerLoad = 3;
class App extends React.Component { class App extends React.Component {
constructor(props) {
super(props);
}
state = { admin: false, pollOrder: 'NEWEST_ADDED', web3Provider: true, loading: true, name: '----', symbol: "", decimals: "18", networkName: "" , rawPolls: [], pollsRequested: [], start: 0, state = { admin: false, pollOrder: 'NEWEST_ADDED', web3Provider: true, loading: true, name: '----', symbol: "", decimals: "18", networkName: "" , rawPolls: [], pollsRequested: [], start: 0,
end: pollsPerLoad}; end: pollsPerLoad};
@ -79,9 +76,9 @@ class App extends React.Component {
this._getPolls(); this._getPolls();
} }
web3.eth.net.getId((err, netId) => { web3.eth.net.getId((err, netId) => {
if(EmbarkJS.environment == 'testnet' && netId !== TESTNET){ if(EmbarkJS.environment === 'testnet' && netId !== TESTNET){
this.setState({web3Provider: false, networkName: "Ropsten"}); this.setState({web3Provider: false, networkName: "Ropsten"});
} else if(EmbarkJS.environment == 'livenet' && netId !== MAINNET){ } else if(EmbarkJS.environment === 'livenet' && netId !== MAINNET){
this.setState({web3Provider: false, networkName: "Mainnet"}); this.setState({web3Provider: false, networkName: "Mainnet"});
} }
}) })
@ -112,21 +109,20 @@ class App extends React.Component {
} }
_getPolls = async () => { _getPolls = async () => {
this.setState({ loading: true }) this.setState({ loading: true });
const { nPolls, poll } = PollManager.methods; const { nPolls, poll } = PollManager.methods;
const polls = await nPolls().call({from: web3.eth.defaultAccount}); const polls = await nPolls().call({from: web3.eth.defaultAccount});
if (polls) if (polls) getPolls(polls, poll)
getPolls(polls, poll)
.then(omitPolls) .then(omitPolls)
.then(rawPolls => { .then(rawPolls => {
// this._loadIPFSContent(rawPolls);
rawPolls = rawPolls.sort((a,b) => { rawPolls = rawPolls.sort((a,b) => {
if(a.idPoll > b.idPoll) return -1; else if(a.idPoll < b.idPoll) return 1; else return 0; if(a.idPoll > b.idPoll) return -1;
if(a.idPoll < b.idPoll) return 1;
return 0;
}); });
this.setState({rawPolls, loading: false}); this.setState({rawPolls, loading: false});
}); });
else else this.setState({ rawPolls: [], loading: false });
this.setState({ rawPolls: [], loading: false });
} }
updatePoll = async (idPoll) => { updatePoll = async (idPoll) => {
@ -144,11 +140,11 @@ class App extends React.Component {
appendToPoll = (idPoll, data) => { appendToPoll = (idPoll, data) => {
const { rawPolls } = this.state; const { rawPolls } = this.state;
const newPolls = [...rawPolls]; const newPolls = [...rawPolls];
newPolls[idPoll] = { ...newPolls[idPoll], ...data } newPolls[idPoll] = { ...newPolls[idPoll], ...data };
this.setState({ rawPolls: newPolls }); this.setState({ rawPolls: newPolls });
} }
setPollOrder = pollOrder => { this.setState({ pollOrder }) } setPollOrder = pollOrder => { this.setState({ pollOrder }); }
_renderStatus(title, available) { _renderStatus(title, available) {
let className = available ? 'pull-right status-online' : 'pull-right status-offline'; let className = available ? 'pull-right status-online' : 'pull-right status-offline';
@ -162,7 +158,7 @@ class App extends React.Component {
replacePoll = (poll) => { replacePoll = (poll) => {
let rawPolls = this.state.rawPolls; let rawPolls = this.state.rawPolls;
for(let i = 0; i < rawPolls.length; i++){ for(let i = 0; i < rawPolls.length; i++){
if(rawPolls[i].idPoll == poll.idPoll){ if(rawPolls[i].idPoll === poll.idPoll){
rawPolls[i] = poll; rawPolls[i] = poll;
this.setState({rawPolls, t: new Date().getTime()}); this.setState({rawPolls, t: new Date().getTime()});
break; break;
@ -206,7 +202,7 @@ class App extends React.Component {
if(!pollsRequested) return; if(!pollsRequested) return;
for(let i = 0; i < polls.length; i++){11 for(let i = 0; i < polls.length; i++){
if(pollsRequested.includes(polls[i].idPoll)) continue; if(pollsRequested.includes(polls[i].idPoll)) continue;
pollsRequested.push(polls[i].idPoll); pollsRequested.push(polls[i].idPoll);
@ -228,15 +224,12 @@ class App extends React.Component {
} }
render(){ render(){
let { web3Provider, networkName, decimals, symbol, name} = this.state; let {web3Provider, networkName} = this.state;
const { _getPolls, updatePoll, setPollOrder, appendToPoll, replacePoll, loadPollContent, resetPollCounter, loadPollRange, loadMorePolls } = this; const { _getPolls, updatePoll, setPollOrder, appendToPoll, replacePoll, loadPollContent, resetPollCounter, loadPollRange, loadMorePolls } = this;
const votingContext = { getPolls: _getPolls, updatePoll, appendToPoll, setPollOrder, resetPollCounter, replacePoll, loadPollContent, loadPollRange, loadMorePolls, ...this.state }; const votingContext = { getPolls: _getPolls, updatePoll, appendToPoll, setPollOrder, resetPollCounter, replacePoll, loadPollContent, loadPollRange, loadMorePolls, ...this.state };
if(web3Provider){ if(web3Provider) return <MuiThemeProvider theme={muiTheme}>
return <MuiThemeProvider theme={muiTheme}>
<Router> <Router>
<Web3Render ready={web3Provider}> <Web3Render ready={web3Provider}>
<VotingContext.Provider value={votingContext}> <VotingContext.Provider value={votingContext}>
@ -244,14 +237,14 @@ class App extends React.Component {
</VotingContext.Provider> </VotingContext.Provider>
</Web3Render> </Web3Render>
</Router> </Router>
</MuiThemeProvider> </MuiThemeProvider>;
} else {
if(networkName){ if(networkName) return <MuiThemeProvider theme={muiTheme}>
return <MuiThemeProvider theme={muiTheme}>
<div> <div>
<Typography variant="body1" style={{marginTop: "40vh", textAlign:"center"}}><img src="images/warning.svg" width="24" /><br /><br />Please connect to {networkName} to continue.</Typography> <Typography variant="body1" style={{marginTop: "40vh", textAlign:"center"}}><img src="images/warning.svg" width="24" /><br /><br />Please connect to {networkName} to continue.</Typography>
</div></MuiThemeProvider> </div>
} else { </MuiThemeProvider>;
return <MuiThemeProvider theme={muiTheme}> return <MuiThemeProvider theme={muiTheme}>
<Router> <Router>
<Fragment> <Fragment>
@ -261,20 +254,14 @@ class App extends React.Component {
<VotingContext.Provider value={votingContext}> <VotingContext.Provider value={votingContext}>
<Voting /> <Voting />
</VotingContext.Provider> </VotingContext.Provider>
</Web3Render> </Web3Render>;
} }
} /> } />
<Route path="/connectOtherWallet" render={() => <div id="votingDapp"><OtherWallets noWeb3Provider={true} /></div>} /> <Route path="/connectOtherWallet" render={() => <div id="votingDapp"><OtherWallets noWeb3Provider={true} /></div>} />
</Switch> </Switch>
</Fragment> </Fragment>
</Router> </Router>
</MuiThemeProvider> </MuiThemeProvider>;
}
}
} }
} }