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

Use Webpack Aliases (#3711)

Browse Source 
* Adds aliases to Webpack Build

* Use `ui` Webpack alias

* Use `views` alias

* Use `modals` aliase

* Use `providers` aliase

* Use `contracts` aliase

* Use '~' aliase

* from `ui` to from `~/ui`

* from  to from

* from `modals` to from `~/modals`

* from `providers` to from `~/redux/providers`

* from `contracts` to from `~/contracts`

* Updated Webpack App config
This commit is contained in:
Nicolas Gotchac 2016-12-05 11:47:13 +01:00 committed by Jaco Greeff
parent 0c7b7fc8bc
commit 52b4ce0dd7
103 changed files with 152 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// 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';

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

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

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

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

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

@ -17,8 +17,8 @@
import BigNumber from 'bignumber.js';
import { action, computed, observable, transaction } from 'mobx';
import * as abis from '../../contracts/abi';
import builtins from '../../views/Dapps/builtin.json';
import * as abis from '~/contracts/abi';
import builtins from '~/views/Dapps/builtin.json';
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
// 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';
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
// 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 * 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
// 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';
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
// 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';

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

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

8
js/src/index.js
View File

@ -30,14 +30,14 @@ import { useRouterHistory } from 'react-router';
import qs from 'querystring';
import SecureApi from './secureApi';
import ContractInstances from './contracts';
import ContractInstances from '~/contracts';
import { initStore } from './redux';
import ContextProvider from './ui/ContextProvider';
import muiTheme from './ui/Theme';
import ContextProvider from '~/ui/ContextProvider';
import muiTheme from '~/ui/Theme';
import MainApplication from './main';
import { setApi } from './redux/providers/apiActions';
import { setApi } from '~/redux/providers/apiActions';
import './environment';

2
js/src/main.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react';
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';

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 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';
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 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 { eip20, wallet } from '../../contracts/abi';
import { eip20, wallet } from '~/contracts/abi';
const ABI_TYPES = [
{

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

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react';
import { Form, Input, InputAddress } from '../../../ui';
import { Form, Input, InputAddress } from '~/ui';
export default class AccountDetails extends Component {
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 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';

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

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react';
import { Checkbox } from 'material-ui';
import { IdentityIcon } from '../../../ui';
import { IdentityIcon } from '~/ui';
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 EditorAttachFile from 'material-ui/svg-icons/editor/attach-file';
import { Form, Input } from '../../../ui';
import { Form, Input } from '~/ui';
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 { Form, Input } from '../../../ui';
import { Form, Input } from '~/ui';
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 { Checkbox } from 'material-ui';
import { Form, Input } from '../../../ui';
import { Form, Input } from '~/ui';
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 PrintIcon from 'material-ui/svg-icons/action/print';
import { Button, Modal } from '../../ui';
import { Button, Modal } from '~/ui';
import AccountDetails from './AccountDetails';
import AccountDetailsGeth from './AccountDetailsGeth';
@ -33,7 +33,7 @@ import NewImport from './NewImport';
import RawKey from './RawKey';
import RecoveryPhrase from './RecoveryPhrase';
import { createIdentityImg } from '../../api/util/identity';
import { createIdentityImg } from '~/api/util/identity';
import print from './print';
import recoveryPage from './recovery-page.ejs';
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 { bindActionCreators } from 'redux';
import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '../../ui';
import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '~/ui';
import { newError } from '../../redux/actions';
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 { MenuItem } from 'material-ui';
import { AddressSelect, Form, Input, Select } from '../../../ui';
import { AddressSelect, Form, Input, Select } from '~/ui';
import { validateAbi } from '../../../util/validation';
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 { Form, TypedInput } from '../../../ui';
import { Form, TypedInput } from '~/ui';
import { parseAbiType } from '../../../util/abi';
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 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 DetailsStep from './DetailsStep';
@ -27,7 +27,7 @@ import ErrorStep from './ErrorStep';
import styles from './deployContract.css';
import { ERROR_CODES } from '../../api/transport/error';
import { ERROR_CODES } from '~/api/transport/error';
const STEPS = {
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 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';
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 { 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';

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 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 { validateAddress, validateUint } from '../../util/validation';
import DetailsStep from './DetailsStep';
import ERRORS from '../Transfer/errors';
import { ERROR_CODES } from '../../api/transport/error';
import { ERROR_CODES } from '~/api/transport/error';
class ExecuteContract extends Component {
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 PrintIcon from 'material-ui/svg-icons/action/print';
import { Button, Modal } from '../../ui';
import { Button, Modal } from '~/ui';
import { NewAccount, AccountDetails } from '../CreateAccount';
@ -28,7 +28,7 @@ import Completed from './Completed';
import TnC from './TnC';
import Welcome from './Welcome';
import { createIdentityImg } from '../../api/util/identity';
import { createIdentityImg } from '~/api/util/identity';
import print from '../CreateAccount/print';
import recoveryPage from '../CreateAccount/recovery-page.ejs';
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 moment from 'moment';
import { Button, Modal, Editor } from '../../ui';
import { Button, Modal, Editor } from '~/ui';
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 { bindActionCreators } from 'redux';
import { showSnackbar } from '../../redux/providers/snackbarActions';
import { showSnackbar } from '~/redux/providers/snackbarActions';
import Form, { Input } from '../../ui/Form';
import { Button, Modal, IdentityName, IdentityIcon } from '../../ui';
import Form, { Input } from '~/ui/Form';
import { Button, Modal, IdentityName, IdentityIcon } from '~/ui';
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 ErrorIcon from 'material-ui/svg-icons/navigation/close';
import { fromWei } from '../../../api/util/wei';
import { Form, Input } from '../../../ui';
import { fromWei } from '~/api/util/wei';
import { Form, Input } from '~/ui';
import { termsOfService } from '../../../3rdparty/sms-verification';
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 { Form, Input } from '../../../ui';
import { Form, Input } from '~/ui';
export default class QueryCode extends Component {
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 CancelIcon from 'material-ui/svg-icons/content/clear';
import { Button, IdentityIcon, Modal } from '../../ui';
import { Button, IdentityIcon, Modal } from '~/ui';
import {
LOADING,

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

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

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

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

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

@ -16,11 +16,11 @@
import { observable, computed, autorun, action } from 'mobx';
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 checkIfTxFailed from '../../util/check-if-tx-failed';
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 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 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 { Checkbox, MenuItem } from 'material-ui';
import { Form, Input, Select } from '../../../ui';
import { Form, Input, Select } from '~/ui';
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 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 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 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 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 Form, { Input } from '../../../ui/Form';
import Form, { Input } from '~/ui/Form';
import GasPriceSelector from '../GasPriceSelector';
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 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';
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 NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
import { newError } from '../../ui/Errors/actions';
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui';
import { newError } from '~/ui/Errors/actions';
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '~/ui';
import Details from './Details';
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
// 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 { clearStatusLogs, toggleStatusLogs, toggleStatusRefresh } from './providers/statusActions';
import { toggleView } from '../views/Settings/actions';
import { toggleView } from '~/views/Settings/actions';
export {
newError,

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

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

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

@ -17,9 +17,9 @@
import { throttle } from 'lodash';
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 {
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 { 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';
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
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import Contracts from '../../contracts';
import Contracts from '~/contracts';
export function setBlock (blockNumber, block) {
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
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import Contracts from '../../../contracts';
import Contracts from '~/contracts';
import { addCertification } from './actions';
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/>.
import { handleActions } from 'redux-actions';
import { bytesToHex } from '../../api/util/format';
import { bytesToHex } from '~/api/util/format';
const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000';

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

@ -16,7 +16,7 @@
import * as actions from './signerActions';
import { inHex } from '../../api/format/input';
import { inHex } from '~/api/format/input';
import { Wallet } from '../../util/wallet';
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 certificationsReducer from './providers/certifications/reducer';
import errorReducer from '../ui/Errors/reducers';
import settingsReducer from '../views/Settings/reducers';
import tooltipReducer from '../ui/Tooltips/reducers';
import errorReducer from '~/ui/Errors/reducers';
import settingsReducer from '~/views/Settings/reducers';
import tooltipReducer from '~/ui/Tooltips/reducers';
export default function () {
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/>.
import { hashToImageUrl } from './providers/imagesReducer';
import { withError } from '../ui/Errors/middleware';
import { withError } from '~/ui/Errors/middleware';
export {
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 { bindActionCreators } from 'redux';
import { hashToImageUrl } from '../../redux/providers/imagesReducer';
import { fetchCertifications } from '../../redux/providers/certifications/actions';
import { hashToImageUrl } from '~/redux/providers/imagesReducer';
import { fetchCertifications } from '~/redux/providers/certifications/actions';
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 Theme from '../Theme';
import { showSnackbar } from '../../redux/providers/snackbarActions';
import { showSnackbar } from '~/redux/providers/snackbarActions';
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 IdentityIcon from '../../IdentityIcon';
import util from '../../../api/util';
import util from '~/api/util';
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 RemoveIcon from 'material-ui/svg-icons/content/remove';
import Input from '../../../ui/Form/Input';
import InputAddressSelect from '../../../ui/Form/InputAddressSelect';
import Select from '../../../ui/Form/Select';
import Input from '~/ui/Form/Input';
import InputAddressSelect from '~/ui/Form/InputAddressSelect';
import Select from '~/ui/Form/Select';
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 CircularProgress from 'material-ui/CircularProgress';
import Contracts from '../../contracts';
import Contracts from '~/contracts';
import { Input, InputAddress } from '../Form';
import styles from './methodDecoding.css';

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

@ -16,7 +16,7 @@
import BigNumber from 'bignumber.js';
import util from '../api/util';
import util from '~/api/util';
export const ERRORS = {
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 { createDecipheriv } from 'browserify-aes';
import { inHex } from '../api/format/input';
import { sha3 } from '../api/util/sha3';
import { inHex } from '~/api/format/input';
import { sha3 } from '~/api/util/sha3';
// 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 { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '../../../ui';
import CopyToClipboard from '../../../ui/CopyToClipboard';
import Certifications from '../../../ui/Certifications';
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '~/ui';
import CopyToClipboard from '~/ui/CopyToClipboard';
import Certifications from '~/ui/Certifications';
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 etherscan from '../../../3rdparty/etherscan';
import { Container, TxList } from '../../../ui';
import { Container, TxList } from '~/ui';
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 VerifyIcon from 'material-ui/svg-icons/action/verified-user';
import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
import { Actionbar, Button, Page } from '../../ui';
import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '~/modals';
import { Actionbar, Button, Page } from '~/ui';
import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
import Header from './Header';
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';

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

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react';
import { Container } from '../../../ui';
import { Container } from '~/ui';
import Summary from '../Summary';
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 { 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 {
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 List from './List';
import { CreateAccount } from '../../modals';
import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '../../ui';
import { setVisibleAccounts } from '../../redux/providers/personalActions';
import { CreateAccount } from '~/modals';
import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
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 { bindActionCreators } from 'redux';
import { ConfirmDialog, IdentityIcon, IdentityName } from '../../../ui';
import { ConfirmDialog, IdentityIcon, IdentityName } from '~/ui';
import { newError } from '../../../redux/actions';
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 ContentCreate from 'material-ui/svg-icons/content/create';
import { EditMeta } from '../../modals';
import { Actionbar, Button, Page } from '../../ui';
import { EditMeta } from '~/modals';
import { Actionbar, Button, Page } from '~/ui';
import Header from '../Account/Header';
import Transactions from '../Account/Transactions';
import Delete from './Delete';
import { setVisibleAccounts } from '../../redux/providers/personalActions';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
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 Summary from '../Accounts/Summary';
import { AddAddress } from '../../modals';
import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
import { setVisibleAccounts } from '../../redux/providers/personalActions';
import { AddAddress } from '~/modals';
import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
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 { FirstRun } from '../../../modals';
import { Errors, ParityBackground, Tooltips } from '../../../ui';
import { FirstRun } from '~/modals';
import { Errors, ParityBackground, Tooltips } from '~/ui';
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 { Errors } from '../../../ui';
import { Errors } from '~/ui';
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 { darkBlack, grey800 } from 'material-ui/styles/colors';
import { closeSnackbar } from '../../../redux/providers/snackbarActions';
import { closeSnackbar } from '~/redux/providers/snackbarActions';
const bodyStyle = {
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 { bindActionCreators } from 'redux';
import { BlockStatus } from '../../../ui';
import CopyToClipboard from '../../../ui/CopyToClipboard';
import { BlockStatus } from '~/ui';
import CopyToClipboard from '~/ui/CopyToClipboard';
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 { isEqual } from 'lodash';
import { Badge, Tooltip } from '../../../ui';
import { Badge, Tooltip } from '~/ui';
import styles from './tabBar.css';
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 NotificationVpnLock from 'material-ui/svg-icons/notification/vpn-lock';
import { Input } from '../../ui';
import { Input } from '~/ui';
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 React, { Component, PropTypes } from 'react';
import { IdentityIcon, IdentityName, Input, InputAddress } from '../../../../ui';
import ShortenedHash from '../../../../ui/ShortenedHash';
import { IdentityIcon, IdentityName, Input, InputAddress } from '~/ui';
import ShortenedHash from '~/ui/ShortenedHash';
import { txLink } from '../../../../3rdparty/etherscan/links';
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 { Container } from '../../../ui';
import { Container } from '~/ui';
import Event from './Event';
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 { 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';

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 InputQuery from './inputQuery';
import { Container, Input, InputAddress } from '../../../ui';
import { Container, Input, InputAddress } from '~/ui';
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 { newError } from '../../redux/actions';
import { setVisibleAccounts } from '../../redux/providers/personalActions';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
import { EditMeta, ExecuteContract } from '../../modals';
import { Actionbar, Button, Page, Modal, Editor } from '../../ui';
import { EditMeta, ExecuteContract } from '~/modals';
import { Actionbar, Button, Page, Modal, Editor } from '~/ui';
import Header from '../Account/Header';
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 { Link } from 'react-router';
import { Container, ContainerTitle, IdentityIcon, IdentityName } from '../../../ui';
import { Container, ContainerTitle, IdentityIcon, IdentityName } from '~/ui';
export default class Summary extends Component {
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 { uniq, isEqual } from 'lodash';
import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
import { AddContract, DeployContract } from '../../modals';
import { setVisibleAccounts } from '../../redux/providers/personalActions';
import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
import { AddContract, DeployContract } from '~/modals';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
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 Checkbox from 'material-ui/Checkbox';
import { Modal, Button } from '../../../ui';
import { Modal, Button } from '~/ui';
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 { Link } from 'react-router';
import { Container, ContainerTitle, Tags } from '../../../ui';
import { Container, ContainerTitle, Tags } from '~/ui';
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 { observer } from 'mobx-react';
import { Actionbar, Page } from '../../ui';
import { Actionbar, Page } from '~/ui';
import FlatButton from 'material-ui/FlatButton';
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 store from 'store';
import Contracts from '../../contracts';
import Contracts from '~/contracts';
import { hashToImageUrl } from '../../redux/util';
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 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 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 NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
import { Button, Container, ParityBackground } from '../../../ui';
import { Button, Container, ParityBackground } from '~/ui';
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 { MenuItem } from 'material-ui';
import { Select, Container } from '../../../ui';
import { Select, Container } from '~/ui';
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 { Container } from '../../../ui';
import { Container } from '~/ui';
import layout from '../layout.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 { Checkbox } from 'material-ui';
import { Container } from '../../../ui';
import { Container } from '~/ui';
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 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 styles from './settings.css';

2
js/src/views/Signer/components/Account/Account.js
View File

@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react';
import { IdentityIcon, IdentityName } from '../../../../ui';
import { IdentityIcon, IdentityName } from '~/ui';
import AccountLink from './AccountLink';
import styles from './Account.css';

2
js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/TransactionPendingFormConfirm.js
View File

@ -20,7 +20,7 @@ import { bindActionCreators } from 'redux';
import RaisedButton from 'material-ui/RaisedButton';
import ReactTooltip from 'react-tooltip';
import { Form, Input, IdentityIcon } from '../../../../../ui';
import { Form, Input, IdentityIcon } from '~/ui';
import styles from './TransactionPendingFormConfirm.css';

4
js/src/views/Signer/containers/Embedded/embedded.js
View File

@ -20,8 +20,8 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import Store from '../../store';
import * as RequestsActions from '../../../../redux/providers/signerActions';
import { Container } from '../../../../ui';
import * as RequestsActions from '~/redux/providers/signerActions';
import { Container } from '~/ui';
import RequestPending from '../../components/RequestPending';

4
js/src/views/Signer/containers/RequestsPage/RequestsPage.js
View File

@ -21,8 +21,8 @@ import { connect } from 'react-redux';
import { observer } from 'mobx-react';
import Store from '../../store';
import * as RequestsActions from '../../../../redux/providers/signerActions';
import { Container, Page, TxList } from '../../../../ui';
import * as RequestsActions from '~/redux/providers/signerActions';
import { Container, Page, TxList } from '~/ui';
import RequestPending from '../../components/RequestPending';

2
js/src/views/Signer/signer.js
View File

@ -16,7 +16,7 @@
import React, { Component } from 'react';
import { Actionbar } from '../../ui';
import { Actionbar } from '~/ui';
import RequestsPage from './containers/RequestsPage';
import styles from './signer.css';

2
js/src/views/Status/components/Debug/Debug.js
View File

@ -20,7 +20,7 @@ import AvPlay from 'material-ui/svg-icons/av/play-arrow';
import AvReplay from 'material-ui/svg-icons/av/replay';
import ReorderIcon from 'material-ui/svg-icons/action/reorder';
import { Container } from '../../../../ui';
import { Container } from '~/ui';
import styles from './Debug.css';

2
js/src/views/Status/components/MiningSettings/MiningSettings.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react';
import formatNumber from 'format-number';
import { ContainerTitle, Input } from '../../../../ui';
import { ContainerTitle, Input } from '~/ui';
import { numberFromString } from './numberFromString';
import { decodeExtraData } from './decodeExtraData';

2
js/src/views/Status/components/Status/Status.js
View File

@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react';
import bytes from 'bytes';
import { Container, ContainerTitle, Input } from '../../../../ui';
import { Container, ContainerTitle, Input } from '~/ui';
import styles from './Status.css';
import MiningSettings from '../MiningSettings';

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