Skip to content

Commit

Permalink
indentation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lindskogen
lindskogen committed Apr 8, 2015
1 parent 0a7579b commit e99b720
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 69 deletions.
21 changes: 21 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

# 4 space indentation
[*.py]
indent_style = space
indent_size = 4

# Tab indentation (no size specified)
[*.{js,jsx}]
indent_style = space
indent_size = 4
40 changes: 20 additions & 20 deletions src/client/ethclient.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ var listeners = [];
class EthClient {
constructor() {
try {
let url = null;
if (window.localStorage && window.localStorage.getItem('rpc_url')) {
url = window.localStorage.getItem('rpc_url');
}
this.setJsonRPCUrl(url || 'http://localhost:8080');
let url = null;
if (window.localStorage && window.localStorage.getItem('rpc_url')) {
url = window.localStorage.getItem('rpc_url');
}
this.setJsonRPCUrl(url || 'http://localhost:8080');

var m = web3.eth.getStorageAt(ContractAddress, "0x1");
let WorkerDispatcher = web3.eth.contract(ContractStructure.WorkerDispatcher);
Expand All @@ -24,7 +24,7 @@ class EthClient {
this.isWorker = isWorker();
}
catch(e) {
console.log("Could not contact " + this.getJsonRPCUrl());
console.log("Could not contact " + this.getJsonRPCUrl());
}
}
getCoinbase(success) {
Expand Down Expand Up @@ -99,8 +99,8 @@ class EthClient {
}

unregisterAll() {
this.unregisterPending();
this.unregisterChain();
this.unregisterPending();
this.unregisterChain();
}

registerWorker(maxLength, price, name) {
Expand Down Expand Up @@ -164,25 +164,25 @@ class EthClient {
}

registerListener(callback) {
listeners.push(callback);
listeners.push(callback);
}

getJsonRPCUrl() {
return this._jsonRpcUrl;
}

setJsonRPCUrl(url) {
if (!url.startsWith('http')) {
url = 'http://' + url;
}
this._jsonRpcUrl = url;
if (window.localStorage) {
window.localStorage.setItem('rpc_url', this._jsonRpcUrl);
}
listeners.forEach((func) => {
func(this._jsonRpcUrl);
});
web3.setProvider(new web3.providers.HttpProvider(this._jsonRpcUrl));
if (!url.startsWith('http')) {
url = 'http://' + url;
}
this._jsonRpcUrl = url;
if (window.localStorage) {
window.localStorage.setItem('rpc_url', this._jsonRpcUrl);
}
listeners.forEach((func) => {
func(this._jsonRpcUrl);
});
web3.setProvider(new web3.providers.HttpProvider(this._jsonRpcUrl));
}

sendMsg(to, data) {
Expand Down
12 changes: 6 additions & 6 deletions src/components/JsonRPC.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ import EthClient from "../client/ethclient.js";

let JsonRPC = React.createClass({
getInitialState() {
return {
json_rpc_url: 'http://localhost:8080'
};
return {
json_rpc_url: 'http://localhost:8080'
};
},
handleJsonRpcSubmit(e) {
e.preventDefault();
let newUrl = this.refs.jsonRpcInput.getDOMNode().value.trim();
EthClient.setJsonRPCUrl(newUrl);
},
componentDidMount() {
EthClient.registerListener(this.updateJsonRPCUrl);
EthClient.registerListener(this.updateJsonRPCUrl);
},
updateJsonRPCUrl(newUrl) {
this.setState({json_rpc_url: newUrl});
this.setState({json_rpc_url: newUrl});
},
render() {
return (
Expand All @@ -29,7 +29,7 @@ let JsonRPC = React.createClass({
<div className="col-md-6">
<div className="form-group">
<label labelFor="jsonrpc">JSON RPC URL</label>
<input type="url" className="form-control" id="jsonrpc" ref="jsonRpcInput" placeholder={this.state.json_rpc_url}/>
<input type="url" className="form-control" id="jsonrpc" ref="jsonRpcInput" placeholder={this.state.json_rpc_url}/>
</div>
<button type="submit" className="btn btn-primary">Change</button>
</div>
Expand Down
86 changes: 43 additions & 43 deletions src/components/NavBar.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,50 @@ import NavTab from "./NavTab.jsx";
let Link = Router.Link;

let NavBar = React.createClass({
getInitialState() {
return {
coinbase: "Waiting for AZ",
json_rpc_url: EthClient.getJsonRPCUrl()
getInitialState() {
return {
coinbase: "Waiting for AZ",
json_rpc_url: EthClient.getJsonRPCUrl()
}
},
componentDidMount() {
EthClient.getCoinbase(function(ok) {
this.setState({coinbase: ok})
}.bind(this));
EthClient.registerListener(this.updateJsonRPCUrl);
},
updateJsonRPCUrl(newUrl) {
this.setState({json_rpc_url: newUrl});
},
render() {
return (
<nav className="navbar navbar-default navbar-fixed-top">
<div className="container">
<div className="navbar-header">
<button type="button" className="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span className="sr-only">Toggle navigation</span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
</button>
<a className="navbar-brand" href="#">Zeppelin</a>
</div>
<div id="navbar" className="navbar-collapse collapse">
<ul className="nav navbar-nav">
<NavTab to="dashboard">Dashboard</NavTab>
<NavTab to="worker">Worker</NavTab>
<NavTab to="client">Client</NavTab>
<NavTab to="whisper">Whisper</NavTab>
<NavTab to="jsonrpc">{this.state.json_rpc_url}</NavTab>
</ul>
<ul className="nav navbar-nav navbar-right">
<li><Link to="app">{this.state.coinbase}</Link></li>
</ul>
</div>
</div>
</nav>
);
}
},
componentDidMount() {
EthClient.getCoinbase(function(ok) {
this.setState({coinbase: ok})
}.bind(this));
EthClient.registerListener(this.updateJsonRPCUrl);
},
updateJsonRPCUrl(newUrl) {
this.setState({json_rpc_url: newUrl});
},
render() {
return (
<nav className="navbar navbar-default navbar-fixed-top">
<div className="container">
<div className="navbar-header">
<button type="button" className="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span className="sr-only">Toggle navigation</span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
</button>
<a className="navbar-brand" href="#">Zeppelin</a>
</div>
<div id="navbar" className="navbar-collapse collapse">
<ul className="nav navbar-nav">
<NavTab to="dashboard">Dashboard</NavTab>
<NavTab to="worker">Worker</NavTab>
<NavTab to="client">Client</NavTab>
<NavTab to="whisper">Whisper</NavTab>
<NavTab to="jsonrpc">{this.state.json_rpc_url}</NavTab>
</ul>
<ul className="nav navbar-nav navbar-right">
<li><Link to="app">{this.state.coinbase}</Link></li>
</ul>
</div>
</div>
</nav>
);
}
});

export default NavBar;

0 comments on commit e99b720

Please sign in to comment.