Convert missing icons for ~/ui import

This commit is contained in:
Jaco Greeff 2017-04-24 15:15:25 +02:00
parent 831e52ea07
commit 1d566a85b2
14 changed files with 17 additions and 60 deletions

View File

@ -71,9 +71,9 @@ const childRoutes = [
{ path: 'web/:url', component: Web } { path: 'web/:url', component: Web }
]; ];
// TODO : use ES6 imports when supported // TODO: use ES6 imports when supported
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const Playground = require('./playground').default; const Playground = require('./views/Playground').default;
childRoutes.push({ childRoutes.push({
path: 'playground', path: 'playground',

View File

@ -19,6 +19,7 @@ export AddressesIcon from 'material-ui/svg-icons/communication/contacts';
export AddIcon from 'material-ui/svg-icons/content/add'; export AddIcon from 'material-ui/svg-icons/content/add';
export AppsIcon from 'material-ui/svg-icons/navigation/apps'; export AppsIcon from 'material-ui/svg-icons/navigation/apps';
export AttachFileIcon from 'material-ui/svg-icons/editor/attach-file'; export AttachFileIcon from 'material-ui/svg-icons/editor/attach-file';
export BackgroundIcon from 'material-ui/svg-icons/image/blur-on';
export CancelIcon from 'material-ui/svg-icons/content/clear'; export CancelIcon from 'material-ui/svg-icons/content/clear';
export CheckIcon from 'material-ui/svg-icons/navigation/check'; export CheckIcon from 'material-ui/svg-icons/navigation/check';
export CloseIcon from 'material-ui/svg-icons/navigation/close'; export CloseIcon from 'material-ui/svg-icons/navigation/close';
@ -34,6 +35,7 @@ export DoneIcon from 'material-ui/svg-icons/action/done-all';
export DialIcon from 'material-ui/svg-icons/communication/dialpad'; export DialIcon from 'material-ui/svg-icons/communication/dialpad';
export EditIcon from 'material-ui/svg-icons/content/create'; export EditIcon from 'material-ui/svg-icons/content/create';
export ErrorIcon from 'material-ui/svg-icons/alert/error'; export ErrorIcon from 'material-ui/svg-icons/alert/error';
export Ethernet from 'material-ui/svg-icons/action/settings-ethernet';
export FileDownloadIcon from 'material-ui/svg-icons/file/file-download'; export FileDownloadIcon from 'material-ui/svg-icons/file/file-download';
export FileUploadIcon from 'material-ui/svg-icons/file/file-upload'; export FileUploadIcon from 'material-ui/svg-icons/file/file-upload';
export FileIcon from 'material-ui/svg-icons/editor/insert-drive-file'; export FileIcon from 'material-ui/svg-icons/editor/insert-drive-file';
@ -65,6 +67,7 @@ export StarCircleIcon from 'material-ui/svg-icons/action/stars';
export StarIcon from 'material-ui/svg-icons/toggle/star'; export StarIcon from 'material-ui/svg-icons/toggle/star';
export StarOutlineIcon from 'material-ui/svg-icons/toggle/star-border'; export StarOutlineIcon from 'material-ui/svg-icons/toggle/star-border';
export StatusIcon from 'material-ui/svg-icons/action/track-changes'; export StatusIcon from 'material-ui/svg-icons/action/track-changes';
export SubdirectoryIcon from 'material-ui/svg-icons/navigation/subdirectory-arrow-left';
export UnlockedIcon from 'material-ui/svg-icons/action/lock-open'; export UnlockedIcon from 'material-ui/svg-icons/action/lock-open';
export UpdateIcon from 'material-ui/svg-icons/action/system-update-alt'; export UpdateIcon from 'material-ui/svg-icons/action/system-update-alt';
export UpdateWaitIcon from 'material-ui/svg-icons/action/update'; export UpdateWaitIcon from 'material-ui/svg-icons/action/update';

View File

@ -18,13 +18,13 @@ import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import ContentAdd from 'material-ui/svg-icons/content/add';
import { uniq, isEqual } from 'lodash'; 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 { AddIcon } from '~/ui/Icons';
import { setVisibleAccounts } from '~/redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import styles from './addresses.css'; import styles from './addresses.css';
@ -135,7 +135,7 @@ class Addresses extends Component {
const buttons = [ const buttons = [
<Button <Button
key='newAddress' key='newAddress'
icon={ <ContentAdd /> } icon={ <AddIcon /> }
label={ label={
<FormattedMessage <FormattedMessage
id='addresses.buttons.add' id='addresses.buttons.add'

View File

@ -18,9 +18,9 @@ import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { bindActionCreators } from '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 { RefreshIcon } from '~/ui/Icons';
import { updateBackground } from '~/redux/providers/settings/actions'; import { updateBackground } from '~/redux/providers/settings/actions';
@ -78,7 +78,7 @@ class Background extends Component {
</div> </div>
<div> <div>
<Button <Button
icon={ <NavigationRefresh /> } icon={ <RefreshIcon /> }
label={ label={
<FormattedMessage <FormattedMessage
id='settings.background.button_more' id='settings.background.button_more'

View File

@ -68,28 +68,6 @@ class Views extends Component {
</div> </div>
</div> </div>
<div className={ layout.details }> <div className={ layout.details }>
{
this.renderView('accounts',
<FormattedMessage
id='settings.views.accounts.label'
/>,
<FormattedMessage
id='settings.views.accounts.description'
defaultMessage='A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.'
/>
)
}
{
this.renderView('addresses',
<FormattedMessage
id='settings.views.addresses.label'
/>,
<FormattedMessage
id='settings.views.addresses.description'
defaultMessage='A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.'
/>
)
}
{ {
this.renderView('apps', this.renderView('apps',
<FormattedMessage <FormattedMessage
@ -101,28 +79,6 @@ class Views extends Component {
/> />
) )
} }
{
this.renderView('contracts',
<FormattedMessage
id='settings.views.contracts.label'
/>,
<FormattedMessage
id='settings.views.contracts.description'
defaultMessage='Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.'
/>
)
}
{
this.renderView('signer',
<FormattedMessage
id='settings.views.signer.label'
/>,
<FormattedMessage
id='settings.views.signer.description'
defaultMessage='The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by distributed applications.'
/>
)
}
</div> </div>
</div> </div>
</Container> </Container>

View File

@ -17,12 +17,11 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { Tab, Tabs } from 'material-ui'; import { Tab, Tabs } from 'material-ui';
import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethernet';
import ImageBlurOn from 'material-ui/svg-icons/image/blur-on'; import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
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 { BackgroundIcon, Ethernet, VisibleIcon } from '~/ui/Icons';
import styles from './settings.css'; import styles from './settings.css';
@ -42,7 +41,7 @@ export default class Settings extends Component {
let proxy = null; let proxy = null;
if (!isProxied) { if (!isProxied) {
proxy = this.renderTab(hash, 'proxy', <ActionSettingsEthernet />); proxy = this.renderTab(hash, 'proxy', <Ethernet />);
} }
return ( return (
@ -54,8 +53,8 @@ export default class Settings extends Component {
} }
> >
<Tabs className={ styles.tabs } value={ hash }> <Tabs className={ styles.tabs } value={ hash }>
{ this.renderTab(hash, 'views', <ImageRemoveRedEye />) } { this.renderTab(hash, 'views', <VisibleIcon />) }
{ this.renderTab(hash, 'background', <ImageBlurOn />) } { this.renderTab(hash, 'background', <BackgroundIcon />) }
{ proxy } { proxy }
{ this.renderTab(hash, 'parity', <img src={ imagesEthcoreBlock } className={ styles.imageIcon } />) } { this.renderTab(hash, 'parity', <img src={ imagesEthcoreBlock } className={ styles.imageIcon } />) }
</Tabs> </Tabs>

View File

@ -16,10 +16,9 @@
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import Subdirectory from 'material-ui/svg-icons/navigation/subdirectory-arrow-left';
import { Button, DappUrlInput } from '~/ui'; import { Button, DappUrlInput } from '~/ui';
import { CloseIcon, RefreshIcon } from '~/ui/Icons'; import { CloseIcon, RefreshIcon, SubdirectoryIcon } from '~/ui/Icons';
@observer @observer
export default class AddressBar extends Component { export default class AddressBar extends Component {
@ -51,7 +50,7 @@ export default class AddressBar extends Component {
<Button <Button
disabled={ isPristine } disabled={ isPristine }
onClick={ this.onGotoUrl } onClick={ this.onGotoUrl }
icon={ <Subdirectory /> } icon={ <SubdirectoryIcon /> }
/> />
</div> </div>
); );