grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into check-updates

Browse Source
This commit is contained in:
Gav Wood 2016-12-05 07:09:42 -08:00
commit afe4cc6a05
No known key found for this signature in database
GPG Key ID: C49C1ACA1CC9B252
114 changed files with 282 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1273,7 +1273,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-precompiled" name = "parity-ui-precompiled"
version = "1.4.0" version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#55a2cc4707bf9f8bacde3c3f68e32b4a5ac777cf" source = "git+https://github.com/ethcore/js-precompiled.git#7700411d2b0ba1372e0d6cf72a84ecf873a181f3"
dependencies = [ dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

3
ethcore/res/authority_round.json
View File

@ -21,8 +21,7 @@
"genesis": { "genesis": {
"seal": { "seal": {
"generic": { "generic": {
"fields": 2, "rlp": "0xc28080"
"rlp": "0x200"
} }
}, },
"difficulty": "0x20000", "difficulty": "0x20000",

1
ethcore/res/instant_seal.json
View File

@ -12,7 +12,6 @@
"genesis": { "genesis": {
"seal": { "seal": {
"generic": { "generic": {
"fields": 0,
"rlp": "0x0" "rlp": "0x0"
} }
}, },

9
ethcore/src/spec/seal.rs
View File

@ -30,11 +30,9 @@ pub struct Ethereum {
impl Into<Generic> for Ethereum { impl Into<Generic> for Ethereum {
fn into(self) -> Generic { fn into(self) -> Generic {
let mut s = RlpStream::new(); let mut s = RlpStream::new_list(2);
s.append(&self.mix_hash); s.append(&self.mix_hash).append(&self.nonce);
s.append(&self.nonce);
Generic { Generic {
fields: 2,
rlp: s.out() rlp: s.out()
} }
} }
@ -42,8 +40,6 @@ impl Into<Generic> for Ethereum {
/// Generic seal. /// Generic seal.
pub struct Generic { pub struct Generic {
/// Number of seal fields.
pub fields: usize,
/// Seal rlp. /// Seal rlp.
pub rlp: Vec<u8>, pub rlp: Vec<u8>,
} }
@ -64,7 +60,6 @@ impl From<ethjson::spec::Seal> for Seal {
mix_hash: eth.mix_hash.into() mix_hash: eth.mix_hash.into()
}), }),
ethjson::spec::Seal::Generic(g) => Seal::Generic(Generic { ethjson::spec::Seal::Generic(g) => Seal::Generic(Generic {
fields: g.fields,
rlp: g.rlp.into() rlp: g.rlp.into()
}) })
} }

13
ethcore/src/spec/spec.rs
View File

@ -94,8 +94,6 @@ pub struct Spec {
pub receipts_root: H256, pub receipts_root: H256,
/// The genesis block's extra data field. /// The genesis block's extra data field.
pub extra_data: Bytes, pub extra_data: Bytes,
/// The number of seal fields in the genesis block.
pub seal_fields: usize,
/// Each seal field, expressed as RLP, concatenated. /// Each seal field, expressed as RLP, concatenated.
pub seal_rlp: Bytes, pub seal_rlp: Bytes,
@ -127,7 +125,6 @@ impl From<ethjson::spec::Spec> for Spec {
gas_used: g.gas_used, gas_used: g.gas_used,
timestamp: g.timestamp, timestamp: g.timestamp,
extra_data: g.extra_data, extra_data: g.extra_data,
seal_fields: seal.fields,
seal_rlp: seal.rlp, seal_rlp: seal.rlp,
state_root_memo: RwLock::new(g.state_root), state_root_memo: RwLock::new(g.state_root),
genesis_state: From::from(s.accounts), genesis_state: From::from(s.accounts),
@ -192,13 +189,8 @@ impl Spec {
header.set_gas_limit(self.gas_limit.clone()); header.set_gas_limit(self.gas_limit.clone());
header.set_difficulty(self.difficulty.clone()); header.set_difficulty(self.difficulty.clone());
header.set_seal({ header.set_seal({
let seal = { let r = Rlp::new(&self.seal_rlp);
let mut s = RlpStream::new_list(self.seal_fields); r.iter().map(|f| f.as_raw().to_vec()).collect()
s.append_raw(&self.seal_rlp, self.seal_fields);
s.out()
};
let r = Rlp::new(&seal);
(0..self.seal_fields).map(|i| r.at(i).as_raw().to_vec()).collect()
}); });
trace!(target: "spec", "Header hash is {}", header.hash()); trace!(target: "spec", "Header hash is {}", header.hash());
header header
@ -227,7 +219,6 @@ impl Spec {
self.gas_used = g.gas_used; self.gas_used = g.gas_used;
self.timestamp = g.timestamp; self.timestamp = g.timestamp;
self.extra_data = g.extra_data; self.extra_data = g.extra_data;
self.seal_fields = seal.fields;
self.seal_rlp = seal.rlp; self.seal_rlp = seal.rlp;
self.state_root_memo = RwLock::new(g.state_root); self.state_root_memo = RwLock::new(g.state_root);
} }

2
js/.npmrc
View File

@ -1 +1 @@
save-prefix='~' save-prefix=''

233
js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "parity.js", "name": "parity.js",
"version": "0.2.89", "version": "0.2.91",
"main": "release/index.js", "main": "release/index.js",
"jsnext:main": "src/index.js", "jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>", "author": "Parity Team <admin@parity.io>",
@ -47,132 +47,127 @@
"prepush": "npm run lint:cached" "prepush": "npm run lint:cached"
}, },
"devDependencies": { "devDependencies": {
"babel-cli": "~6.18.0", "babel-cli": "6.18.0",
"babel-core": "~6.18.2", "babel-core": "6.18.2",
"babel-eslint": "~7.1.0", "babel-eslint": "7.1.1",
"babel-loader": "~6.2.3", "babel-loader": "6.2.8",
"babel-plugin-lodash": "~3.2.2", "babel-plugin-lodash": "3.2.10",
"babel-plugin-transform-class-properties": "~6.19.0", "babel-plugin-transform-class-properties": "6.19.0",
"babel-plugin-transform-decorators-legacy": "~1.3.4", "babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-plugin-transform-react-remove-prop-types": "~0.2.9", "babel-plugin-transform-react-remove-prop-types": "0.2.11",
"babel-plugin-transform-runtime": "~6.15.0", "babel-plugin-transform-runtime": "6.15.0",
"babel-polyfill": "~6.16.0", "babel-polyfill": "6.16.0",
"babel-preset-es2015": "~6.18.0", "babel-preset-es2015": "6.18.0",
"babel-preset-es2015-rollup": "~1.2.0", "babel-preset-es2015-rollup": "1.2.0",
"babel-preset-es2016": "~6.16.0", "babel-preset-es2016": "6.16.0",
"babel-preset-es2017": "~6.16.0", "babel-preset-es2017": "6.16.0",
"babel-preset-react": "~6.16.0", "babel-preset-react": "6.16.0",
"babel-preset-stage-0": "~6.16.0", "babel-preset-stage-0": "6.16.0",
"babel-register": "6.18.0", "babel-register": "6.18.0",
"babel-runtime": "~6.18.0", "babel-runtime": "6.18.0",
"chai": "~3.5.0", "chai": "3.5.0",
"chai-enzyme": "0.4.2", "chai-enzyme": "0.6.1",
"cheerio": "0.20.0", "copy-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "~4.0.0", "core-js": "2.4.1",
"core-js": "~2.4.1", "coveralls": "2.11.15",
"coveralls": "~2.11.11", "css-loader": "0.26.1",
"css-loader": "~0.26.0", "ejs-loader": "0.3.0",
"ejs-loader": "~0.3.0", "enzyme": "2.6.0",
"enzyme": "2.3.0", "eslint": "3.11.1",
"eslint": "~3.10.2", "eslint-config-semistandard": "7.0.0",
"eslint-config-semistandard": "~7.0.0", "eslint-config-standard": "6.2.1",
"eslint-config-standard": "~6.2.1", "eslint-config-standard-react": "4.2.0",
"eslint-config-standard-react": "~4.2.0", "eslint-plugin-promise": "3.4.0",
"eslint-plugin-promise": "~3.4.0", "eslint-plugin-react": "6.7.1",
"eslint-plugin-react": "~6.7.1", "eslint-plugin-standard": "2.0.1",
"eslint-plugin-standard": "~2.0.0", "express": "4.14.0",
"express": "~4.14.0",
"extract-loader": "0.1.0", "extract-loader": "0.1.0",
"extract-text-webpack-plugin": "~2.0.0-beta.4", "extract-text-webpack-plugin": "2.0.0-beta.4",
"file-loader": "~0.9.0", "file-loader": "0.9.0",
"fs-extra": "~0.30.0", "happypack": "3.0.0",
"happypack": "~3.0.0", "html-loader": "0.4.4",
"history": "~2.0.0", "html-webpack-plugin": "2.24.1",
"html-loader": "~0.4.4", "http-proxy-middleware": "0.17.2",
"html-webpack-plugin": "~2.24.1", "husky": "0.11.9",
"http-proxy-middleware": "~0.17.2", "ignore-styles": "5.0.1",
"husky": "~0.11.9", "image-webpack-loader": "3.0.0",
"ignore-styles": "2.0.0", "istanbul": "1.0.0-alpha.2",
"image-webpack-loader": "~3.0.0", "jsdom": "9.8.3",
"istanbul": "~1.0.0-alpha.2", "json-loader": "0.5.4",
"jsdom": "9.2.1", "mocha": "3.2.0",
"json-loader": "~0.5.4",
"mocha": "~3.0.0-1",
"mock-local-storage": "1.0.2", "mock-local-storage": "1.0.2",
"mock-socket": "~3.0.1", "mock-socket": "6.0.3",
"nock": "~8.0.0", "nock": "9.0.2",
"postcss-import": "8.1.0", "postcss-import": "8.1.0",
"postcss-loader": "~1.1.1", "postcss-loader": "1.1.1",
"postcss-nested": "~1.0.0", "postcss-nested": "1.0.0",
"postcss-simple-vars": "~3.0.0", "postcss-simple-vars": "3.0.0",
"progress": "~1.1.8", "progress": "1.1.8",
"raw-loader": "~0.5.1", "raw-loader": "0.5.1",
"react-addons-perf": "~15.4.1", "react-addons-perf": "15.4.1",
"react-addons-test-utils": "~15.4.1", "react-addons-test-utils": "15.4.1",
"react-hot-loader": "~3.0.0-beta.6", "react-hot-loader": "3.0.0-beta.6",
"rucksack-css": "~0.8.6", "rucksack-css": "0.9.1",
"sinon": "~1.17.4", "sinon": "1.17.6",
"sinon-as-promised": "~4.0.2", "sinon-as-promised": "4.0.2",
"sinon-chai": "~2.8.0", "sinon-chai": "2.8.0",
"style-loader": "~0.13.0", "style-loader": "0.13.1",
"url-loader": "~0.5.7", "url-loader": "0.5.7",
"webpack": "~2.1.0-beta.27", "webpack": "2.1.0-beta.27",
"webpack-dev-middleware": "~1.8.4", "webpack-dev-middleware": "1.8.4",
"webpack-error-notification": "0.1.6", "webpack-error-notification": "0.1.6",
"webpack-hot-middleware": "~2.13.2", "webpack-hot-middleware": "2.13.2",
"websocket": "~1.0.23" "websocket": "1.0.23"
}, },
"dependencies": { "dependencies": {
"bignumber.js": "~2.3.0", "bignumber.js": "3.0.1",
"blockies": "0.0.2", "blockies": "0.0.2",
"brace": "~0.9.0", "brace": "0.9.0",
"bytes": "~2.4.0", "bytes": "2.4.0",
"chart.js": "~2.3.0", "es6-error": "4.0.0",
"es6-error": "~4.0.0", "es6-promise": "4.0.5",
"es6-promise": "~3.2.1", "ethereumjs-tx": "1.1.4",
"ethereumjs-tx": "~1.1.2", "eventemitter3": "2.0.2",
"eventemitter3": "~2.0.2", "file-saver": "1.3.3",
"file-saver": "~1.3.3", "format-json": "1.0.3",
"format-json": "~1.0.3", "format-number": "2.0.1",
"format-number": "~2.0.1", "geopattern": "1.2.3",
"geopattern": "~1.2.3", "isomorphic-fetch": "2.2.1",
"isomorphic-fetch": "~2.2.1", "js-sha3": "0.5.5",
"js-sha3": "~0.5.2", "lodash": "4.17.2",
"lodash": "~4.11.1", "marked": "0.3.6",
"marked": "~0.3.6", "material-ui": "0.16.4",
"material-ui": "~0.16.4", "material-ui-chip-input": "0.11.1",
"material-ui-chip-input": "~0.11.1", "mobx": "2.6.4",
"mobx": "~2.6.1", "mobx-react": "4.0.3",
"mobx-react": "~3.5.8", "mobx-react-devtools": "4.2.10",
"mobx-react-devtools": "~4.2.9", "moment": "2.17.0",
"moment": "~2.14.1", "phoneformat.js": "1.0.3",
"phoneformat.js": "~1.0.3", "qs": "6.3.0",
"qs": "~6.3.0", "react": "15.4.1",
"react": "~15.4.1", "react-ace": "4.1.0",
"react-ace": "~4.0.0", "react-addons-css-transition-group": "15.4.1",
"react-addons-css-transition-group": "~15.4.1", "react-copy-to-clipboard": "4.2.3",
"react-chartjs-2": "~1.5.0", "react-dom": "15.4.1",
"react-copy-to-clipboard": "~4.2.3", "react-dropzone": "3.7.3",
"react-dom": "~15.4.1", "react-redux": "4.4.6",
"react-dropzone": "~3.7.3", "react-router": "3.0.0",
"react-redux": "~4.4.5", "react-router-redux": "4.0.7",
"react-router": "~2.6.1", "react-tap-event-plugin": "2.0.1",
"react-router-redux": "~4.0.5", "react-tooltip": "3.2.2",
"react-tap-event-plugin": "~2.0.1", "recharts": "0.15.2",
"react-tooltip": "~2.0.3", "redux": "3.6.0",
"recharts": "~0.15.2", "redux-actions": "1.1.0",
"redux": "~3.5.2", "redux-thunk": "2.1.0",
"redux-actions": "~0.10.1", "rlp": "2.0.0",
"redux-thunk": "~2.1.0", "scryptsy": "2.0.0",
"rlp": "~2.0.0",
"scryptsy": "~2.0.0",
"solc": "ngotchac/solc-js", "solc": "ngotchac/solc-js",
"store": "~1.3.20", "store": "1.3.20",
"utf8": "~2.1.1", "utf8": "2.1.2",
"valid-url": "~1.0.9", "valid-url": "1.0.9",
"validator": "~5.7.0", "validator": "6.2.0",
"web3": "~0.17.0-beta", "web3": "0.17.0-beta",
"whatwg-fetch": "~1.0.0", "whatwg-fetch": "2.0.1",
"worker-loader": "~0.7.1" "worker-loader": "0.7.1"
} }
} }

2
js/src/contracts/badgereg.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { bytesToHex, hex2Ascii } from '../api/util/format'; import { bytesToHex, hex2Ascii } from '~/api/util/format';
import ABI from './abi/certifier.json'; import ABI from './abi/certifier.json';

7
js/src/dapps/basiccoin.js
View File

@ -16,8 +16,7 @@
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import React from 'react'; import React from 'react';
import { createHashHistory } from 'history'; import { Redirect, Router, Route, hashHistory } from 'react-router';
import { Redirect, Router, Route, useRouterHistory } from 'react-router';
import injectTapEventPlugin from 'react-tap-event-plugin'; import injectTapEventPlugin from 'react-tap-event-plugin';
injectTapEventPlugin(); injectTapEventPlugin();
@ -27,14 +26,12 @@ import Application from './basiccoin/Application';
import Overview from './basiccoin/Overview'; import Overview from './basiccoin/Overview';
import Transfer from './basiccoin/Transfer'; import Transfer from './basiccoin/Transfer';
const routerHistory = useRouterHistory(createHashHistory)({});
import '../../assets/fonts/Roboto/font.css'; import '../../assets/fonts/Roboto/font.css';
import '../../assets/fonts/RobotoMono/font.css'; import '../../assets/fonts/RobotoMono/font.css';
import './style.css'; import './style.css';
ReactDOM.render( ReactDOM.render(
<Router history={ routerHistory }> <Router history={ hashHistory }>
<Redirect from='/' to='/overview' /> <Redirect from='/' to='/overview' />
<Route path='/' component={ Application }> <Route path='/' component={ Application }>
<Route path='deploy' component={ Deploy } /> <Route path='deploy' component={ Deploy } />

2
js/src/dapps/basiccoin/Transfer/Send/send.js
View File

@ -17,7 +17,7 @@
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { eip20 } from '../../../../contracts/abi'; import { eip20 } from '~/contracts/abi';
import { api } from '../../parity'; import { api } from '../../parity';
import { loadBalances } from '../../services'; import { loadBalances } from '../../services';

2
js/src/dapps/basiccoin/services.js
View File

@ -16,7 +16,7 @@
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import * as abis from '../../contracts/abi'; import * as abis from '~/contracts/abi';
import { api } from './parity'; import { api } from './parity';
let managerInstance; let managerInstance;

4
js/src/dapps/dappreg/dappsStore.js
View File

@ -17,8 +17,8 @@
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import { action, computed, observable, transaction } from 'mobx'; import { action, computed, observable, transaction } from 'mobx';
import * as abis from '../../contracts/abi'; import * as abis from '~/contracts/abi';
import builtins from '../../views/Dapps/builtin.json'; import builtins from '~/views/Dapps/builtin.json';
import { api } from './parity'; import { api } from './parity';

2
js/src/dapps/githubhint/services.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import * as abis from '../../contracts/abi'; import * as abis from '~/contracts/abi';
import { api } from './parity'; import { api } from './parity';
export function attachInterface () { export function attachInterface () {

2
js/src/dapps/registry/actions.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { registry as registryAbi } from '../../contracts/abi'; import { registry as registryAbi } from '~/contracts/abi';
import { api } from './parity.js'; import { api } from './parity.js';
import * as addresses from './addresses/actions.js'; import * as addresses from './addresses/actions.js';

2
js/src/dapps/signaturereg/services.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import * as abis from '../../contracts/abi'; import * as abis from '~/contracts/abi';
import { api } from './parity'; import { api } from './parity';
const sortEvents = (a, b) => b.blockNumber.cmp(a.blockNumber) || b.logIndex.cmp(a.logIndex); const sortEvents = (a, b) => b.blockNumber.cmp(a.blockNumber) || b.logIndex.cmp(a.logIndex);

2
js/src/dapps/tokenreg/Status/actions.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import Contracts from '../../../contracts'; import Contracts from '~/contracts';
import { loadToken, setTokenPending, deleteToken, setTokenData } from '../Tokens/actions'; import { loadToken, setTokenPending, deleteToken, setTokenData } from '../Tokens/actions';

2
js/src/dapps/tokenreg/utils.js
View File

@ -16,7 +16,7 @@
import { api } from './parity'; import { api } from './parity';
import { eip20 as eip20Abi } from '../../contracts/abi'; import { eip20 as eip20Abi } from '~/contracts/abi';
export const getTokenTotalSupply = (tokenAddress) => { export const getTokenTotalSupply = (tokenAddress) => {
return api return api

35
js/src/index.js
View File

@ -25,19 +25,18 @@ import ReactDOM from 'react-dom';
import { AppContainer } from 'react-hot-loader'; import { AppContainer } from 'react-hot-loader';
import injectTapEventPlugin from 'react-tap-event-plugin'; import injectTapEventPlugin from 'react-tap-event-plugin';
import { createHashHistory } from 'history'; import { hashHistory } from 'react-router';
import { useRouterHistory } from 'react-router';
import qs from 'querystring'; import qs from 'querystring';
import SecureApi from './secureApi'; import SecureApi from './secureApi';
import ContractInstances from './contracts'; import ContractInstances from '~/contracts';
import { initStore } from './redux'; import { initStore } from './redux';
import ContextProvider from './ui/ContextProvider'; import ContextProvider from '~/ui/ContextProvider';
import muiTheme from './ui/Theme'; import muiTheme from '~/ui/Theme';
import MainApplication from './main'; import MainApplication from './main';
import { setApi } from './redux/providers/apiActions'; import { setApi } from '~/redux/providers/apiActions';
import './environment'; import './environment';
@ -74,13 +73,11 @@ store.dispatch(setApi(api));
window.secureApi = api; window.secureApi = api;
const routerHistory = useRouterHistory(createHashHistory)({});
ReactDOM.render( ReactDOM.render(
<AppContainer> <AppContainer>
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }> <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
<MainApplication <MainApplication
routerHistory={ routerHistory } routerHistory={ hashHistory }
/> />
</ContextProvider> </ContextProvider>
</AppContainer>, </AppContainer>,
@ -88,24 +85,6 @@ ReactDOM.render(
); );
if (module.hot) { if (module.hot) {
// module.hot.accept('./redux', () => {
// // redux store has a method replaceReducer
// // const newStore = initStore(api);
// console.warn('REDUX UPDATE');
// // store.replaceReducer(appReducer);
// // ReactDOM.render(
// // <AppContainer>
// // <ContextProvider api={ api } muiTheme={ muiTheme } store={ newStore }>
// // <MainApplication
// // routerHistory={ routerHistory }
// // />
// // </ContextProvider>
// // </AppContainer>,
// // document.querySelector('#container')
// // );
// });
module.hot.accept('./main.js', () => { module.hot.accept('./main.js', () => {
require('./main.js'); require('./main.js');
@ -113,7 +92,7 @@ if (module.hot) {
<AppContainer> <AppContainer>
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }> <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
<MainApplication <MainApplication
routerHistory={ routerHistory } routerHistory={ hashHistory }
/> />
</ContextProvider> </ContextProvider>
</AppContainer>, </AppContainer>,

2
js/src/main.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Redirect, Router, Route } from 'react-router'; import { Redirect, Router, Route } from 'react-router';
import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from './views'; import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from '~/views';
import styles from './reset.css'; import styles from './reset.css';

2
js/src/modals/AddAddress/addAddress.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import ContentAdd from 'material-ui/svg-icons/content/add'; import ContentAdd from 'material-ui/svg-icons/content/add';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { Button, Modal, Form, Input, InputAddress } from '../../ui'; import { Button, Modal, Form, Input, InputAddress } from '~/ui';
import { ERRORS, validateAddress, validateName } from '../../util/validation'; import { ERRORS, validateAddress, validateName } from '../../util/validation';
export default class AddAddress extends Component { export default class AddAddress extends Component {

4
js/src/modals/AddContract/addContract.js
View File

@ -20,10 +20,10 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward'; import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back'; import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
import { Button, Modal, Form, Input, InputAddress, RadioButtons } from '../../ui'; import { Button, Modal, Form, Input, InputAddress, RadioButtons } from '~/ui';
import { ERRORS, validateAbi, validateAddress, validateName } from '../../util/validation'; import { ERRORS, validateAbi, validateAddress, validateName } from '../../util/validation';
import { eip20, wallet } from '../../contracts/abi'; import { eip20, wallet } from '~/contracts/abi';
const ABI_TYPES = [ const ABI_TYPES = [
{ {

2
js/src/modals/CreateAccount/AccountDetails/accountDetails.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Form, Input, InputAddress } from '../../../ui'; import { Form, Input, InputAddress } from '~/ui';
export default class AccountDetails extends Component { export default class AccountDetails extends Component {
static propTypes = { static propTypes = {

2
js/src/modals/CreateAccount/NewAccount/newAccount.js
View File

@ -19,7 +19,7 @@ import IconButton from 'material-ui/IconButton';
import { RadioButton, RadioButtonGroup } from 'material-ui/RadioButton'; import { RadioButton, RadioButtonGroup } from 'material-ui/RadioButton';
import ActionAutorenew from 'material-ui/svg-icons/action/autorenew'; import ActionAutorenew from 'material-ui/svg-icons/action/autorenew';
import { Form, Input, IdentityIcon } from '../../../ui'; import { Form, Input, IdentityIcon } from '~/ui';
import styles from '../createAccount.css'; import styles from '../createAccount.css';

2
js/src/modals/CreateAccount/NewGeth/newGeth.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Checkbox } from 'material-ui'; import { Checkbox } from 'material-ui';
import { IdentityIcon } from '../../../ui'; import { IdentityIcon } from '~/ui';
import styles from './newGeth.css'; import styles from './newGeth.css';

2
js/src/modals/CreateAccount/NewImport/newImport.js
View File

@ -19,7 +19,7 @@ import ReactDOM from 'react-dom';
import { FloatingActionButton } from 'material-ui'; import { FloatingActionButton } from 'material-ui';
import EditorAttachFile from 'material-ui/svg-icons/editor/attach-file'; import EditorAttachFile from 'material-ui/svg-icons/editor/attach-file';
import { Form, Input } from '../../../ui'; import { Form, Input } from '~/ui';
import styles from '../createAccount.css'; import styles from '../createAccount.css';

2
js/src/modals/CreateAccount/RawKey/rawKey.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Form, Input } from '../../../ui'; import { Form, Input } from '~/ui';
import styles from '../createAccount.css'; import styles from '../createAccount.css';

2
js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Checkbox } from 'material-ui'; import { Checkbox } from 'material-ui';
import { Form, Input } from '../../../ui'; import { Form, Input } from '~/ui';
import styles from '../createAccount.css'; import styles from '../createAccount.css';

4
js/src/modals/CreateAccount/createAccount.js
View File

@ -22,7 +22,7 @@ import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward'; import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
import PrintIcon from 'material-ui/svg-icons/action/print'; import PrintIcon from 'material-ui/svg-icons/action/print';
import { Button, Modal } from '../../ui'; import { Button, Modal } from '~/ui';
import AccountDetails from './AccountDetails'; import AccountDetails from './AccountDetails';
import AccountDetailsGeth from './AccountDetailsGeth'; import AccountDetailsGeth from './AccountDetailsGeth';
@ -33,7 +33,7 @@ import NewImport from './NewImport';
import RawKey from './RawKey'; import RawKey from './RawKey';
import RecoveryPhrase from './RecoveryPhrase'; import RecoveryPhrase from './RecoveryPhrase';
import { createIdentityImg } from '../../api/util/identity'; import { createIdentityImg } from '~/api/util/identity';
import print from './print'; import print from './print';
import recoveryPage from './recovery-page.ejs'; import recoveryPage from './recovery-page.ejs';
import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg'; import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';

2
js/src/modals/DeleteAccount/deleteAccount.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '../../ui'; import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '~/ui';
import { newError } from '../../redux/actions'; import { newError } from '../../redux/actions';
import styles from './deleteAccount.css'; import styles from './deleteAccount.css';

2
js/src/modals/DeployContract/DetailsStep/detailsStep.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { MenuItem } from 'material-ui'; import { MenuItem } from 'material-ui';
import { AddressSelect, Form, Input, Select } from '../../../ui'; import { AddressSelect, Form, Input, Select } from '~/ui';
import { validateAbi } from '../../../util/validation'; import { validateAbi } from '../../../util/validation';
import { parseAbiType } from '../../../util/abi'; import { parseAbiType } from '../../../util/abi';

2
js/src/modals/DeployContract/ParametersStep/parametersStep.js
View File

@ -31,7 +31,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Form, TypedInput } from '../../../ui'; import { Form, TypedInput } from '~/ui';
import { parseAbiType } from '../../../util/abi'; import { parseAbiType } from '../../../util/abi';
import styles from '../deployContract.css'; import styles from '../deployContract.css';

4
js/src/modals/DeployContract/deployContract.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import ActionDoneAll from 'material-ui/svg-icons/action/done-all'; import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { BusyStep, CompletedStep, CopyToClipboard, Button, IdentityIcon, Modal, TxHash } from '../../ui'; import { BusyStep, CompletedStep, CopyToClipboard, Button, IdentityIcon, Modal, TxHash } from '~/ui';
import { ERRORS, validateAbi, validateCode, validateName } from '../../util/validation'; import { ERRORS, validateAbi, validateCode, validateName } from '../../util/validation';
import DetailsStep from './DetailsStep'; import DetailsStep from './DetailsStep';
@ -27,7 +27,7 @@ import ErrorStep from './ErrorStep';
import styles from './deployContract.css'; import styles from './deployContract.css';
import { ERROR_CODES } from '../../api/transport/error'; import { ERROR_CODES } from '~/api/transport/error';
const STEPS = { const STEPS = {
CONTRACT_DETAILS: { title: 'contract details' }, CONTRACT_DETAILS: { title: 'contract details' },

2
js/src/modals/EditMeta/editMeta.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import ContentSave from 'material-ui/svg-icons/content/save'; import ContentSave from 'material-ui/svg-icons/content/save';
import { Button, Form, Input, InputChip, Modal } from '../../ui'; import { Button, Form, Input, InputChip, Modal } from '~/ui';
import { validateName } from '../../util/validation'; import { validateName } from '../../util/validation';
export default class EditMeta extends Component { export default class EditMeta extends Component {

2
js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { MenuItem } from 'material-ui'; import { MenuItem } from 'material-ui';
import { AddressSelect, Form, Input, InputAddressSelect, Select } from '../../../ui'; import { AddressSelect, Form, Input, InputAddressSelect, Select } from '~/ui';
import styles from '../executeContract.css'; import styles from '../executeContract.css';

4
js/src/modals/ExecuteContract/executeContract.js
View File

@ -20,14 +20,14 @@ import { bindActionCreators } from 'redux';
import ActionDoneAll from 'material-ui/svg-icons/action/done-all'; import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui'; import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '~/ui';
import { MAX_GAS_ESTIMATION } from '../../util/constants'; import { MAX_GAS_ESTIMATION } from '../../util/constants';
import { validateAddress, validateUint } from '../../util/validation'; import { validateAddress, validateUint } from '../../util/validation';
import DetailsStep from './DetailsStep'; import DetailsStep from './DetailsStep';
import ERRORS from '../Transfer/errors'; import ERRORS from '../Transfer/errors';
import { ERROR_CODES } from '../../api/transport/error'; import { ERROR_CODES } from '~/api/transport/error';
class ExecuteContract extends Component { class ExecuteContract extends Component {
static contextTypes = { static contextTypes = {

4
js/src/modals/FirstRun/firstRun.js
View File

@ -20,7 +20,7 @@ import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward'; import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
import PrintIcon from 'material-ui/svg-icons/action/print'; import PrintIcon from 'material-ui/svg-icons/action/print';
import { Button, Modal } from '../../ui'; import { Button, Modal } from '~/ui';
import { NewAccount, AccountDetails } from '../CreateAccount'; import { NewAccount, AccountDetails } from '../CreateAccount';
@ -28,7 +28,7 @@ import Completed from './Completed';
import TnC from './TnC'; import TnC from './TnC';
import Welcome from './Welcome'; import Welcome from './Welcome';
import { createIdentityImg } from '../../api/util/identity'; import { createIdentityImg } from '~/api/util/identity';
import print from '../CreateAccount/print'; import print from '../CreateAccount/print';
import recoveryPage from '../CreateAccount/recovery-page.ejs'; import recoveryPage from '../CreateAccount/recovery-page.ejs';
import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg'; import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';

2
js/src/modals/LoadContract/loadContract.js
View File

@ -24,7 +24,7 @@ import { List, ListItem, makeSelectable } from 'material-ui/List';
import { Subheader, IconButton, Tabs, Tab } from 'material-ui'; import { Subheader, IconButton, Tabs, Tab } from 'material-ui';
import moment from 'moment'; import moment from 'moment';
import { Button, Modal, Editor } from '../../ui'; import { Button, Modal, Editor } from '~/ui';
import styles from './loadContract.css'; import styles from './loadContract.css';

6
js/src/modals/PasswordManager/passwordManager.js
View File

@ -24,10 +24,10 @@ import Paper from 'material-ui/Paper';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { showSnackbar } from '../../redux/providers/snackbarActions'; import { showSnackbar } from '~/redux/providers/snackbarActions';
import Form, { Input } from '../../ui/Form'; import Form, { Input } from '~/ui/Form';
import { Button, Modal, IdentityName, IdentityIcon } from '../../ui'; import { Button, Modal, IdentityName, IdentityIcon } from '~/ui';
import styles from './passwordManager.css'; import styles from './passwordManager.css';

4
js/src/modals/SMSVerification/GatherData/gatherData.js
View File

@ -22,8 +22,8 @@ import InfoIcon from 'material-ui/svg-icons/action/info-outline';
import SuccessIcon from 'material-ui/svg-icons/navigation/check'; import SuccessIcon from 'material-ui/svg-icons/navigation/check';
import ErrorIcon from 'material-ui/svg-icons/navigation/close'; import ErrorIcon from 'material-ui/svg-icons/navigation/close';
import { fromWei } from '../../../api/util/wei'; import { fromWei } from '~/api/util/wei';
import { Form, Input } from '../../../ui'; import { Form, Input } from '~/ui';
import { termsOfService } from '../../../3rdparty/sms-verification'; import { termsOfService } from '../../../3rdparty/sms-verification';
import styles from './gatherData.css'; import styles from './gatherData.css';

2
js/src/modals/SMSVerification/QueryCode/queryCode.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Form, Input } from '../../../ui'; import { Form, Input } from '~/ui';
export default class QueryCode extends Component { export default class QueryCode extends Component {
static propTypes = { static propTypes = {

2
js/src/modals/SMSVerification/SMSVerification.js
View File

@ -19,7 +19,7 @@ import { observer } from 'mobx-react';
import DoneIcon from 'material-ui/svg-icons/action/done-all'; import DoneIcon from 'material-ui/svg-icons/action/done-all';
import CancelIcon from 'material-ui/svg-icons/content/clear'; import CancelIcon from 'material-ui/svg-icons/content/clear';
import { Button, IdentityIcon, Modal } from '../../ui'; import { Button, IdentityIcon, Modal } from '~/ui';
import { import {
LOADING, LOADING,

2
js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import nullable from '../../../util/nullable-proptype'; import nullable from '../../../util/nullable-proptype';
import TxHash from '../../../ui/TxHash'; import TxHash from '~/ui/TxHash';
import { import {
POSTING_CONFIRMATION, POSTED_CONFIRMATION POSTING_CONFIRMATION, POSTED_CONFIRMATION
} from '../store'; } from '../store';

2
js/src/modals/SMSVerification/SendRequest/sendRequest.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import nullable from '../../../util/nullable-proptype'; import nullable from '../../../util/nullable-proptype';
import TxHash from '../../../ui/TxHash'; import TxHash from '~/ui/TxHash';
import { import {
POSTING_REQUEST, POSTED_REQUEST, REQUESTING_SMS POSTING_REQUEST, POSTED_REQUEST, REQUESTING_SMS
} from '../store'; } from '../store';

6
js/src/modals/SMSVerification/store.js
View File

@ -16,11 +16,11 @@
import { observable, computed, autorun, action } from 'mobx'; import { observable, computed, autorun, action } from 'mobx';
import phone from 'phoneformat.js'; import phone from 'phoneformat.js';
import { sha3 } from '../../api/util/sha3'; import { sha3 } from '~/api/util/sha3';
import Contracts from '../../contracts'; import Contracts from '~/contracts';
import { checkIfVerified, checkIfRequested, awaitPuzzle } from '../../contracts/sms-verification'; import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/sms-verification';
import { postToServer } from '../../3rdparty/sms-verification'; import { postToServer } from '../../3rdparty/sms-verification';
import checkIfTxFailed from '../../util/check-if-tx-failed'; import checkIfTxFailed from '../../util/check-if-tx-failed';
import waitForConfirmations from '../../util/wait-for-block-confirmations'; import waitForConfirmations from '../../util/wait-for-block-confirmations';

2
js/src/modals/SaveContract/saveContract.js
View File

@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
import SaveIcon from 'material-ui/svg-icons/content/save'; import SaveIcon from 'material-ui/svg-icons/content/save';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { Button, Modal, Editor, Form, Input } from '../../ui'; import { Button, Modal, Editor, Form, Input } from '~/ui';
import { ERRORS, validateName } from '../../util/validation'; import { ERRORS, validateName } from '../../util/validation';
import styles from './saveContract.css'; import styles from './saveContract.css';

2
js/src/modals/Shapeshift/OptionsStep/optionsStep.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Checkbox, MenuItem } from 'material-ui'; import { Checkbox, MenuItem } from 'material-ui';
import { Form, Input, Select } from '../../../ui'; import { Form, Input, Select } from '~/ui';
import Price from '../Price'; import Price from '../Price';

2
js/src/modals/Shapeshift/shapeshift.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import ActionDoneAll from 'material-ui/svg-icons/action/done-all'; import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { Button, IdentityIcon, Modal } from '../../ui'; import { Button, IdentityIcon, Modal } from '~/ui';
import initShapeshift from '../../3rdparty/shapeshift'; import initShapeshift from '../../3rdparty/shapeshift';
import shapeshiftLogo from '../../../assets/images/shapeshift-logo.png'; import shapeshiftLogo from '../../../assets/images/shapeshift-logo.png';

2
js/src/modals/Transfer/Details/details.js
View File

@ -20,7 +20,7 @@ import { Checkbox, MenuItem } from 'material-ui';
import { isEqual } from 'lodash'; import { isEqual } from 'lodash';
import Form, { Input, InputAddressSelect, Select } from '../../../ui/Form'; import Form, { Input, InputAddressSelect, Select } from '~/ui/Form';
import imageUnknown from '../../../../assets/images/contracts/unknown-64x64.png'; import imageUnknown from '../../../../assets/images/contracts/unknown-64x64.png';
import styles from '../transfer.css'; import styles from '../transfer.css';

2
js/src/modals/Transfer/Extras/extras.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import Form, { Input } from '../../../ui/Form'; import Form, { Input } from '~/ui/Form';
import GasPriceSelector from '../GasPriceSelector'; import GasPriceSelector from '../GasPriceSelector';
import styles from '../transfer.css'; import styles from '../transfer.css';

2
js/src/modals/Transfer/store.js
View File

@ -18,7 +18,7 @@ import { observable, computed, action, transaction } from 'mobx';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import ERRORS from './errors'; import ERRORS from './errors';
import { ERROR_CODES } from '../../api/transport/error'; import { ERROR_CODES } from '~/api/transport/error';
import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '../../util/constants'; import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '../../util/constants';
const TITLES = { const TITLES = {

4
js/src/modals/Transfer/transfer.js
View File

@ -24,8 +24,8 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back'; import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward'; import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
import { newError } from '../../ui/Errors/actions'; import { newError } from '~/ui/Errors/actions';
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui'; import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '~/ui';
import Details from './Details'; import Details from './Details';
import Extras from './Extras'; import Extras from './Extras';

4
js/src/redux/actions.js
View File

@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { newError } from '../ui/Errors/actions'; import { newError } from '~/ui/Errors/actions';
import { setAddressImage } from './providers/imagesActions'; import { setAddressImage } from './providers/imagesActions';
import { clearStatusLogs, toggleStatusLogs, toggleStatusRefresh } from './providers/statusActions'; import { clearStatusLogs, toggleStatusLogs, toggleStatusRefresh } from './providers/statusActions';
import { toggleView } from '../views/Settings/actions'; import { toggleView } from '~/views/Settings/actions';
export { export {
newError, newError,

6
js/src/redux/middleware.js
View File

@ -15,11 +15,11 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import thunk from 'redux-thunk'; import thunk from 'redux-thunk';
import ErrorsMiddleware from '../ui/Errors/middleware'; import ErrorsMiddleware from '~/ui/Errors/middleware';
import SettingsMiddleware from '../views/Settings/middleware'; import SettingsMiddleware from '~/views/Settings/middleware';
import SignerMiddleware from './providers/signerMiddleware'; import SignerMiddleware from './providers/signerMiddleware';
import statusMiddleware from '../views/Status/middleware'; import statusMiddleware from '~/views/Status/middleware';
import CertificationsMiddleware from './providers/certifications/middleware'; import CertificationsMiddleware from './providers/certifications/middleware';
export default function (api) { export default function (api) {

4
js/src/redux/providers/balances.js
View File

@ -17,9 +17,9 @@
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { loadTokens, setTokenReg, fetchBalances, fetchTokens, fetchTokensBalances } from './balancesActions'; import { loadTokens, setTokenReg, fetchBalances, fetchTokens, fetchTokensBalances } from './balancesActions';
import { padRight } from '../../api/util/format'; import { padRight } from '~/api/util/format';
import Contracts from '../../contracts'; import Contracts from '~/contracts';
export default class Balances { export default class Balances {
constructor (store, api) { constructor (store, api) {

2
js/src/redux/providers/balancesActions.js
View File

@ -19,7 +19,7 @@ import { range, uniq, isEqual } from 'lodash';
import { hashToImageUrl } from './imagesReducer'; import { hashToImageUrl } from './imagesReducer';
import { setAddressImage } from './imagesActions'; import { setAddressImage } from './imagesActions';
import * as ABIS from '../../contracts/abi'; import * as ABIS from '~/contracts/abi';
import imagesEthereum from '../../../assets/images/contracts/ethereum-black-64x64.png'; import imagesEthereum from '../../../assets/images/contracts/ethereum-black-64x64.png';
const ETH = { const ETH = {

2
js/src/redux/providers/blockchainActions.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import Contracts from '../../contracts'; import Contracts from '~/contracts';
export function setBlock (blockNumber, block) { export function setBlock (blockNumber, block) {
return { return {

2
js/src/redux/providers/certifications/middleware.js
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import Contracts from '../../../contracts'; import Contracts from '~/contracts';
import { addCertification } from './actions'; import { addCertification } from './actions';
const knownCertifiers = [ 'smsverification' ]; const knownCertifiers = [ 'smsverification' ];

2
js/src/redux/providers/imagesReducer.js
View File

@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { handleActions } from 'redux-actions'; import { handleActions } from 'redux-actions';
import { bytesToHex } from '../../api/util/format'; import { bytesToHex } from '~/api/util/format';
const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000'; const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000';

2
js/src/redux/providers/signerMiddleware.js
View File

@ -16,7 +16,7 @@
import * as actions from './signerActions'; import * as actions from './signerActions';
import { inHex } from '../../api/format/input'; import { inHex } from '~/api/format/input';
import { Wallet } from '../../util/wallet'; import { Wallet } from '../../util/wallet';
export default class SignerMiddleware { export default class SignerMiddleware {

6
js/src/redux/reducers.js
View File

@ -20,9 +20,9 @@ import { routerReducer } from 'react-router-redux';
import { apiReducer, balancesReducer, blockchainReducer, compilerReducer, imagesReducer, personalReducer, signerReducer, statusReducer as nodeStatusReducer, snackbarReducer } from './providers'; import { apiReducer, balancesReducer, blockchainReducer, compilerReducer, imagesReducer, personalReducer, signerReducer, statusReducer as nodeStatusReducer, snackbarReducer } from './providers';
import certificationsReducer from './providers/certifications/reducer'; import certificationsReducer from './providers/certifications/reducer';
import errorReducer from '../ui/Errors/reducers'; import errorReducer from '~/ui/Errors/reducers';
import settingsReducer from '../views/Settings/reducers'; import settingsReducer from '~/views/Settings/reducers';
import tooltipReducer from '../ui/Tooltips/reducers'; import tooltipReducer from '~/ui/Tooltips/reducers';
export default function () { export default function () {
return combineReducers({ return combineReducers({

2
js/src/redux/util.js
View File

@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import { hashToImageUrl } from './providers/imagesReducer'; import { hashToImageUrl } from './providers/imagesReducer';
import { withError } from '../ui/Errors/middleware'; import { withError } from '~/ui/Errors/middleware';
export { export {
hashToImageUrl, hashToImageUrl,

4
js/src/ui/Certifications/certifications.js
View File

@ -18,8 +18,8 @@ import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { hashToImageUrl } from '../../redux/providers/imagesReducer'; import { hashToImageUrl } from '~/redux/providers/imagesReducer';
import { fetchCertifications } from '../../redux/providers/certifications/actions'; import { fetchCertifications } from '~/redux/providers/certifications/actions';
import defaultIcon from '../../../assets/images/certifications/unknown.svg'; import defaultIcon from '../../../assets/images/certifications/unknown.svg';

2
js/src/ui/CopyToClipboard/copyToClipboard.js
View File

@ -23,7 +23,7 @@ import Clipboard from 'react-copy-to-clipboard';
import CopyIcon from 'material-ui/svg-icons/content/content-copy'; import CopyIcon from 'material-ui/svg-icons/content/content-copy';
import Theme from '../Theme'; import Theme from '../Theme';
import { showSnackbar } from '../../redux/providers/snackbarActions'; import { showSnackbar } from '~/redux/providers/snackbarActions';
const { textColor, disabledTextColor } = Theme.flatButton; const { textColor, disabledTextColor } = Theme.flatButton;

2
js/src/ui/Form/InputAddress/inputAddress.js
View File

@ -20,7 +20,7 @@ import { bindActionCreators } from 'redux';
import Input from '../Input'; import Input from '../Input';
import IdentityIcon from '../../IdentityIcon'; import IdentityIcon from '../../IdentityIcon';
import util from '../../../api/util'; import util from '~/api/util';
import styles from './inputAddress.css'; import styles from './inputAddress.css';

6
js/src/ui/Form/TypedInput/typedInput.js
View File

@ -22,9 +22,9 @@ import IconButton from 'material-ui/IconButton';
import AddIcon from 'material-ui/svg-icons/content/add'; import AddIcon from 'material-ui/svg-icons/content/add';
import RemoveIcon from 'material-ui/svg-icons/content/remove'; import RemoveIcon from 'material-ui/svg-icons/content/remove';
import Input from '../../../ui/Form/Input'; import Input from '~/ui/Form/Input';
import InputAddressSelect from '../../../ui/Form/InputAddressSelect'; import InputAddressSelect from '~/ui/Form/InputAddressSelect';
import Select from '../../../ui/Form/Select'; import Select from '~/ui/Form/Select';
import { ABI_TYPES } from '../../../util/abi'; import { ABI_TYPES } from '../../../util/abi';

2
js/src/ui/MethodDecoding/methodDecoding.js
View File

@ -20,7 +20,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import CircularProgress from 'material-ui/CircularProgress'; import CircularProgress from 'material-ui/CircularProgress';
import Contracts from '../../contracts'; import Contracts from '~/contracts';
import { Input, InputAddress } from '../Form'; import { Input, InputAddress } from '../Form';
import styles from './methodDecoding.css'; import styles from './methodDecoding.css';

2
js/src/util/validation.js
View File

@ -16,7 +16,7 @@
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import util from '../api/util'; import util from '~/api/util';
export const ERRORS = { export const ERRORS = {
invalidAddress: 'address is an invalid network address', invalidAddress: 'address is an invalid network address',

4
js/src/util/wallet.js
View File

@ -19,8 +19,8 @@ import Transaction from 'ethereumjs-tx';
import { pbkdf2Sync } from 'crypto'; import { pbkdf2Sync } from 'crypto';
import { createDecipheriv } from 'browserify-aes'; import { createDecipheriv } from 'browserify-aes';
import { inHex } from '../api/format/input'; import { inHex } from '~/api/format/input';
import { sha3 } from '../api/util/sha3'; import { sha3 } from '~/api/util/sha3';
// Adapted from https://github.com/kvhnuke/etherwallet/blob/mercury/app/scripts/myetherwallet.js // Adapted from https://github.com/kvhnuke/etherwallet/blob/mercury/app/scripts/myetherwallet.js

6
js/src/views/Account/Header/header.js
View File

@ -16,9 +16,9 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '../../../ui'; import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '~/ui';
import CopyToClipboard from '../../../ui/CopyToClipboard'; import CopyToClipboard from '~/ui/CopyToClipboard';
import Certifications from '../../../ui/Certifications'; import Certifications from '~/ui/Certifications';
import styles from './header.css'; import styles from './header.css';

2
js/src/views/Account/Transactions/transactions.js
View File

@ -19,7 +19,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import etherscan from '../../../3rdparty/etherscan'; import etherscan from '../../../3rdparty/etherscan';
import { Container, TxList } from '../../../ui'; import { Container, TxList } from '~/ui';
import styles from './transactions.css'; import styles from './transactions.css';

8
js/src/views/Account/account.js
View File

@ -23,16 +23,16 @@ import ContentSend from 'material-ui/svg-icons/content/send';
import LockIcon from 'material-ui/svg-icons/action/lock'; import LockIcon from 'material-ui/svg-icons/action/lock';
import VerifyIcon from 'material-ui/svg-icons/action/verified-user'; import VerifyIcon from 'material-ui/svg-icons/action/verified-user';
import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals'; import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '~/modals';
import { Actionbar, Button, Page } from '../../ui'; import { Actionbar, Button, Page } from '~/ui';
import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png'; import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
import Header from './Header'; import Header from './Header';
import Transactions from './Transactions'; import Transactions from './Transactions';
import { setVisibleAccounts } from '../../redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import VerificationStore from '../../modals/SMSVerification/store'; import VerificationStore from '~/modals/SMSVerification/store';
import styles from './account.css'; import styles from './account.css';

2
js/src/views/Accounts/List/list.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Container } from '../../../ui'; import { Container } from '~/ui';
import Summary from '../Summary'; import Summary from '../Summary';
import styles from './list.css'; import styles from './list.css';

2
js/src/views/Accounts/Summary/summary.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { isEqual } from 'lodash'; import { isEqual } from 'lodash';
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, Input } from '../../../ui'; import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, Input } from '~/ui';
export default class Summary extends Component { export default class Summary extends Component {
static contextTypes = { static contextTypes = {

6
js/src/views/Accounts/accounts.js
View File

@ -21,9 +21,9 @@ import ContentAdd from 'material-ui/svg-icons/content/add';
import { uniq, isEqual } from 'lodash'; import { uniq, isEqual } from 'lodash';
import List from './List'; import List from './List';
import { CreateAccount } from '../../modals'; import { CreateAccount } from '~/modals';
import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '../../ui'; import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
import { setVisibleAccounts } from '../../redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import styles from './accounts.css'; import styles from './accounts.css';

2
js/src/views/Address/Delete/delete.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { ConfirmDialog, IdentityIcon, IdentityName } from '../../../ui'; import { ConfirmDialog, IdentityIcon, IdentityName } from '~/ui';
import { newError } from '../../../redux/actions'; import { newError } from '../../../redux/actions';
import styles from '../address.css'; import styles from '../address.css';

6
js/src/views/Address/address.js
View File

@ -20,13 +20,13 @@ import { bindActionCreators } from 'redux';
import ActionDelete from 'material-ui/svg-icons/action/delete'; import ActionDelete from 'material-ui/svg-icons/action/delete';
import ContentCreate from 'material-ui/svg-icons/content/create'; import ContentCreate from 'material-ui/svg-icons/content/create';
import { EditMeta } from '../../modals'; import { EditMeta } from '~/modals';
import { Actionbar, Button, Page } from '../../ui'; import { Actionbar, Button, Page } from '~/ui';
import Header from '../Account/Header'; import Header from '../Account/Header';
import Transactions from '../Account/Transactions'; import Transactions from '../Account/Transactions';
import Delete from './Delete'; import Delete from './Delete';
import { setVisibleAccounts } from '../../redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import styles from './address.css'; import styles from './address.css';

6
js/src/views/Addresses/addresses.js
View File

@ -22,9 +22,9 @@ import { uniq, isEqual } from 'lodash';
import List from '../Accounts/List'; import List from '../Accounts/List';
import Summary from '../Accounts/Summary'; import Summary from '../Accounts/Summary';
import { AddAddress } from '../../modals'; import { AddAddress } from '~/modals';
import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui'; import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
import { setVisibleAccounts } from '../../redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import styles from './addresses.css'; import styles from './addresses.css';

4
js/src/views/Application/Container/container.js
View File

@ -16,8 +16,8 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { FirstRun } from '../../../modals'; import { FirstRun } from '~/modals';
import { Errors, ParityBackground, Tooltips } from '../../../ui'; import { Errors, ParityBackground, Tooltips } from '~/ui';
import styles from '../application.css'; import styles from '../application.css';

2
js/src/views/Application/DappContainer/dappContainer.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Errors } from '../../../ui'; import { Errors } from '~/ui';
import styles from '../application.css'; import styles from '../application.css';

2
js/src/views/Application/Snackbar/snackbar.js
View File

@ -21,7 +21,7 @@ import { bindActionCreators } from 'redux';
import { Snackbar as SnackbarMUI } from 'material-ui'; import { Snackbar as SnackbarMUI } from 'material-ui';
import { darkBlack, grey800 } from 'material-ui/styles/colors'; import { darkBlack, grey800 } from 'material-ui/styles/colors';
import { closeSnackbar } from '../../../redux/providers/snackbarActions'; import { closeSnackbar } from '~/redux/providers/snackbarActions';
const bodyStyle = { const bodyStyle = {
backgroundColor: darkBlack, backgroundColor: darkBlack,

4
js/src/views/Application/Status/status.js
View File

@ -18,8 +18,8 @@ import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { BlockStatus } from '../../../ui'; import { BlockStatus } from '~/ui';
import CopyToClipboard from '../../../ui/CopyToClipboard'; import CopyToClipboard from '~/ui/CopyToClipboard';
import styles from './status.css'; import styles from './status.css';

2
js/src/views/Application/TabBar/tabBar.js
View File

@ -21,7 +21,7 @@ import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
import { Tab as MUITab } from 'material-ui/Tabs'; import { Tab as MUITab } from 'material-ui/Tabs';
import { isEqual } from 'lodash'; import { isEqual } from 'lodash';
import { Badge, Tooltip } from '../../../ui'; import { Badge, Tooltip } from '~/ui';
import styles from './tabBar.css'; import styles from './tabBar.css';
import imagesEthcoreBlock from '../../../../assets/images/parity-logo-white-no-text.svg'; import imagesEthcoreBlock from '../../../../assets/images/parity-logo-white-no-text.svg';

2
js/src/views/Connection/connection.js
View File

@ -23,7 +23,7 @@ import ActionDashboard from 'material-ui/svg-icons/action/dashboard';
import HardwareDesktopMac from 'material-ui/svg-icons/hardware/desktop-mac'; import HardwareDesktopMac from 'material-ui/svg-icons/hardware/desktop-mac';
import NotificationVpnLock from 'material-ui/svg-icons/notification/vpn-lock'; import NotificationVpnLock from 'material-ui/svg-icons/notification/vpn-lock';
import { Input } from '../../ui'; import { Input } from '~/ui';
import styles from './connection.css'; import styles from './connection.css';

4
js/src/views/Contract/Events/Event/event.js
View File

@ -18,8 +18,8 @@ import BigNumber from 'bignumber.js';
import moment from 'moment'; import moment from 'moment';
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { IdentityIcon, IdentityName, Input, InputAddress } from '../../../../ui'; import { IdentityIcon, IdentityName, Input, InputAddress } from '~/ui';
import ShortenedHash from '../../../../ui/ShortenedHash'; import ShortenedHash from '~/ui/ShortenedHash';
import { txLink } from '../../../../3rdparty/etherscan/links'; import { txLink } from '../../../../3rdparty/etherscan/links';
import styles from '../../contract.css'; import styles from '../../contract.css';

2
js/src/views/Contract/Events/events.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Container } from '../../../ui'; import { Container } from '~/ui';
import Event from './Event'; import Event from './Event';
import styles from '../contract.css'; import styles from '../contract.css';

2
js/src/views/Contract/Queries/inputQuery.js
View File

@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
import LinearProgress from 'material-ui/LinearProgress'; import LinearProgress from 'material-ui/LinearProgress';
import { Card, CardActions, CardTitle, CardText } from 'material-ui/Card'; import { Card, CardActions, CardTitle, CardText } from 'material-ui/Card';
import { Button, Input, InputAddress, InputAddressSelect } from '../../../ui'; import { Button, Input, InputAddress, InputAddressSelect } from '~/ui';
import styles from './queries.css'; import styles from './queries.css';

2
js/src/views/Contract/Queries/queries.js
View File

@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
import { Card, CardTitle, CardText } from 'material-ui/Card'; import { Card, CardTitle, CardText } from 'material-ui/Card';
import InputQuery from './inputQuery'; import InputQuery from './inputQuery';
import { Container, Input, InputAddress } from '../../../ui'; import { Container, Input, InputAddress } from '~/ui';
import styles from './queries.css'; import styles from './queries.css';

6
js/src/views/Contract/contract.js
View File

@ -24,10 +24,10 @@ import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { newError } from '../../redux/actions'; import { newError } from '../../redux/actions';
import { setVisibleAccounts } from '../../redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import { EditMeta, ExecuteContract } from '../../modals'; import { EditMeta, ExecuteContract } from '~/modals';
import { Actionbar, Button, Page, Modal, Editor } from '../../ui'; import { Actionbar, Button, Page, Modal, Editor } from '~/ui';
import Header from '../Account/Header'; import Header from '../Account/Header';
import Delete from '../Address/Delete'; import Delete from '../Address/Delete';

2
js/src/views/Contracts/Summary/summary.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { Container, ContainerTitle, IdentityIcon, IdentityName } from '../../../ui'; import { Container, ContainerTitle, IdentityIcon, IdentityName } from '~/ui';
export default class Summary extends Component { export default class Summary extends Component {
static contextTypes = { static contextTypes = {

6
js/src/views/Contracts/contracts.js
View File

@ -22,9 +22,9 @@ import ContentAdd from 'material-ui/svg-icons/content/add';
import FileIcon from 'material-ui/svg-icons/action/description'; import FileIcon from 'material-ui/svg-icons/action/description';
import { uniq, isEqual } from 'lodash'; import { uniq, isEqual } from 'lodash';
import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui'; import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
import { AddContract, DeployContract } from '../../modals'; import { AddContract, DeployContract } from '~/modals';
import { setVisibleAccounts } from '../../redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import List from '../Accounts/List'; import List from '../Accounts/List';

2
js/src/views/Dapps/AddDapps/AddDapps.js
View File

@ -20,7 +20,7 @@ import DoneIcon from 'material-ui/svg-icons/action/done';
import { List, ListItem } from 'material-ui/List'; import { List, ListItem } from 'material-ui/List';
import Checkbox from 'material-ui/Checkbox'; import Checkbox from 'material-ui/Checkbox';
import { Modal, Button } from '../../../ui'; import { Modal, Button } from '~/ui';
import styles from './AddDapps.css'; import styles from './AddDapps.css';

2
js/src/views/Dapps/Summary/summary.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { Container, ContainerTitle, Tags } from '../../../ui'; import { Container, ContainerTitle, Tags } from '~/ui';
import styles from './summary.css'; import styles from './summary.css';

2
js/src/views/Dapps/dapps.js
View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { Checkbox } from 'material-ui'; import { Checkbox } from 'material-ui';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import { Actionbar, Page } from '../../ui'; import { Actionbar, Page } from '~/ui';
import FlatButton from 'material-ui/FlatButton'; import FlatButton from 'material-ui/FlatButton';
import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye'; import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye';

2
js/src/views/Dapps/dappsStore.js
View File

@ -18,7 +18,7 @@ import BigNumber from 'bignumber.js';
import { action, computed, observable, transaction } from 'mobx'; import { action, computed, observable, transaction } from 'mobx';
import store from 'store'; import store from 'store';
import Contracts from '../../contracts'; import Contracts from '~/contracts';
import { hashToImageUrl } from '../../redux/util'; import { hashToImageUrl } from '../../redux/util';
import builtinApps from './builtin.json'; import builtinApps from './builtin.json';

2
js/src/views/ParityBar/parityBar.js
View File

@ -21,7 +21,7 @@ import { bindActionCreators } from 'redux';
import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint'; import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
import ContentClear from 'material-ui/svg-icons/content/clear'; import ContentClear from 'material-ui/svg-icons/content/clear';
import { Badge, Button, ContainerTitle, ParityBackground } from '../../ui'; import { Badge, Button, ContainerTitle, ParityBackground } from '~/ui';
import { Embedded as Signer } from '../Signer'; import { Embedded as Signer } from '../Signer';
import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg'; import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg';

2
js/src/views/Settings/Background/background.js
View File

@ -19,7 +19,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh'; import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
import { Button, Container, ParityBackground } from '../../../ui'; import { Button, Container, ParityBackground } from '~/ui';
import { updateBackground } from '../actions'; import { updateBackground } from '../actions';

2
js/src/views/Settings/Parity/parity.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { MenuItem } from 'material-ui'; import { MenuItem } from 'material-ui';
import { Select, Container } from '../../../ui'; import { Select, Container } from '~/ui';
import layout from '../layout.css'; import layout from '../layout.css';

2
js/src/views/Settings/Proxy/proxy.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { Container } from '../../../ui'; import { Container } from '~/ui';
import layout from '../layout.css'; import layout from '../layout.css';
import styles from './proxy.css'; import styles from './proxy.css';

2
js/src/views/Settings/Views/views.js
View File

@ -19,7 +19,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { Checkbox } from 'material-ui'; import { Checkbox } from 'material-ui';
import { Container } from '../../../ui'; import { Container } from '~/ui';
import { toggleView } from '../actions'; import { toggleView } from '../actions';

2
js/src/views/Settings/settings.js
View File

@ -20,7 +20,7 @@ import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethern
import ImageBlurOn from 'material-ui/svg-icons/image/blur-on'; import ImageBlurOn from 'material-ui/svg-icons/image/blur-on';
import ImageRemoveRedEye from 'material-ui/svg-icons/image/remove-red-eye'; import ImageRemoveRedEye from 'material-ui/svg-icons/image/remove-red-eye';
import { Actionbar, Page } from '../../ui'; import { Actionbar, Page } from '~/ui';
import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg'; import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg';
import styles from './settings.css'; import styles from './settings.css';

Some files were not shown because too many files have changed in this diff Show More