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

merge master into jr-email-verification

Browse Source
This commit is contained in:
Jannis R
2016-12-09 16:52:44 +01:00
parent c249c51dd3 1213ada59c
commit eb1429237b
73 changed files with 584 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/views/Account/Transactions/transactions.css
View File

@@ -15,9 +15,6 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.transactions {
}
.infonone {
opacity: 0.25;
}

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

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

2
js/src/views/Account/account.css
View File

@@ -14,8 +14,6 @@
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.account {
}
.btnicon {
width: 24px;

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

@@ -97,7 +97,7 @@ class Account extends Component {
}
return (
<div className={ styles.account }>
<div>
{ this.renderDeleteDialog(account) }
{ this.renderEditDialog(account) }
{ this.renderFundDialog() }

2
js/src/views/Accounts/accounts.css
View File

@@ -14,8 +14,6 @@
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.accounts {
}
.accountTooltip {
top: 13.3em;

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

@@ -82,7 +82,7 @@ class Accounts extends Component {
render () {
return (
<div className={ styles.accounts }>
<div>
{ this.renderNewDialog() }
{ this.renderNewWalletDialog() }
{ this.renderActionbar() }

52
js/src/views/Address/address.css
View File

@@ -14,37 +14,37 @@
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.address {
}
.delete .hero {
padding-bottom: 1em;
}
.delete {
.hero {
padding-bottom: 1em;
}
.delete .info {
display: inline-block;
}
.info {
display: inline-block;
}
.delete .icon {
display: inline-block;
}
.icon {
display: inline-block;
}
.delete .nameinfo {
display: inline-block;
text-align: left;
}
.nameinfo {
display: inline-block;
text-align: left;
}
.delete .header {
text-transform: uppercase;
font-size: 1.25em;
padding-bottom: 0.25em;
}
.header {
text-transform: uppercase;
font-size: 1.25em;
padding-bottom: 0.25em;
}
.delete .address {
}
.address {
}
.delete .description {
padding-top: 1em;
font-size: 0.75em;
color: #aaa;
.description {
padding-top: 1em;
font-size: 0.75em;
color: #aaa;
}
}

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

@@ -28,8 +28,6 @@ import Transactions from '../Account/Transactions';
import Delete from './Delete';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
import styles from './address.css';
class Address extends Component {
static contextTypes = {
api: PropTypes.object.isRequired,
@@ -85,7 +83,7 @@ class Address extends Component {
}
return (
<div className={ styles.address }>
<div>
{ this.renderEditDialog(contact) }
{ this.renderActionbar(contact) }
<Delete

20
js/src/views/Addresses/addresses.css
View File

@@ -14,8 +14,6 @@
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.addresses {
}
.list {
display: flex;
@@ -26,21 +24,21 @@
flex: 0 1 50%;
width: 50%;
position: relative;
}
.address:nth-child(odd)>div {
padding-right: 0.5em !important;
}
&:nth-child(odd)>div {
padding-right: 0.5em !important;
}
.address:nth-child(even)>div {
padding-left: 0.5em !important;
&:nth-child(even)>div {
padding-left: 0.5em !important;
}
}
.empty {
width: 100%;
display: block;
}
.empty div {
color: #aaa;
div {
color: #aaa;
}
}

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

@@ -76,7 +76,7 @@ class Addresses extends Component {
const { searchValues, sortOrder } = this.state;
return (
<div className={ styles.addresses }>
<div>
{ this.renderActionbar() }
{ this.renderAddAddress() }
<Page>

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

@@ -19,7 +19,6 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import ActionCompareArrows from 'material-ui/svg-icons/action/compare-arrows';
import ActionDashboard from 'material-ui/svg-icons/action/dashboard';
// import CommunicationVpnKey from 'material-ui/svg-icons/communication/vpn-key';
import HardwareDesktopMac from 'material-ui/svg-icons/hardware/desktop-mac';
import NotificationVpnLock from 'material-ui/svg-icons/notification/vpn-lock';

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

@@ -20,7 +20,7 @@ import React, { Component, PropTypes } from 'react';
import { IdentityIcon, IdentityName, Input, InputAddress } from '~/ui';
import ShortenedHash from '~/ui/ShortenedHash';
import { txLink } from '../../../../3rdparty/etherscan/links';
import { txLink } from '~/3rdparty/etherscan/links';
import styles from '../../contract.css';

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

@@ -15,6 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import { uniq } from 'lodash';
import { Container } from '~/ui';
@@ -38,7 +39,10 @@ export default class Events extends Component {
return null;
}
const list = events.map((event) => {
const eventsKey = uniq(events.map((e) => e.key));
const list = eventsKey.map((eventKey) => {
const event = events.find((e) => e.key === eventKey);
return (
<Event
key={ event.key }

26
js/src/views/Contract/contract.css
View File

@@ -15,26 +15,26 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.contract {
}
.events {
width: 100%;
border: none;
border-spacing: 0;
}
.events tr {
line-height: 32px;
vertical-align: top;
tr {
line-height: 32px;
vertical-align: top;
}
}
.event {
}
td {
vertical-align: top;
padding: 1em 0.5em;
.event td {
vertical-align: top;
padding: 1em 0.5em;
div {
white-space: nowrap;
}
}
}
.txhash {
@@ -47,10 +47,6 @@
color: #aaa;
}
.event td div {
white-space: nowrap;
}
.mined {
}

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

@@ -124,7 +124,7 @@ class Contract extends Component {
}
return (
<div className={ styles.contract }>
<div>
{ this.renderActionbar(account) }
{ this.renderDeleteDialog(account) }
{ this.renderEditDialog(account) }

18
js/src/views/Contracts/contracts.css
View File

@@ -1,18 +0,0 @@
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
/* This file is part of Parity.
/*
/* Parity is free software: you can redistribute it and/or modify
/* it under the terms of the GNU General Public License as published by
/* the Free Software Foundation, either version 3 of the License, or
/* (at your option) any later version.
/*
/* Parity is distributed in the hope that it will be useful,
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/* GNU General Public License for more details.
/*
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.contracts {
}

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

@@ -28,8 +28,6 @@ import { setVisibleAccounts } from '~/redux/providers/personalActions';
import List from '../Accounts/List';
import styles from './contracts.css';
class Contracts extends Component {
static contextTypes = {
api: PropTypes.object.isRequired
@@ -80,7 +78,7 @@ class Contracts extends Component {
const { searchValues, sortOrder } = this.state;
return (
<div className={ styles.contracts }>
<div>
{ this.renderActionbar() }
{ this.renderAddContract() }
{ this.renderAddContract() }
@@ -159,7 +157,6 @@ class Contracts extends Component {
return (
<Actionbar
className={ styles.toolbar }
title='Contracts'
buttons={ buttons } />
);

44
js/src/views/Settings/settings.css
View File

@@ -15,9 +15,6 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.layout {
}
.menu {
display: inline-block;
}
@@ -35,31 +32,24 @@
padding: 16px 2em !important;
line-height: 24px !important;
width: auto !important;
}
.tabactive {
}
&>div {
height: 24px !important;
.tab>div,
.tabactive>div {
height: 24px !important;
}
&>div {
display: inline-block !important;
}
}
.tab>div>div,
.tabactive>div>div {
display: inline-block !important;
}
svg {
margin-right: 0.5em;
margin-bottom: 0 !important;
}
.tab svg,
.tabactive svg {
margin-right: 0.5em;
margin-bottom: 0 !important;
}
.tab .menu,
.tabactive .menu {
vertical-align: top;
display: inline-block;
.menu {
vertical-align: top;
display: inline-block;
}
}
.imageIcon {
@@ -68,6 +58,8 @@
opacity: 0.5;
}
.tabactive .imageIcon {
opacity: 1;
.tabactive {
.imageIcon {
opacity: 1;
}
}

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

@@ -45,7 +45,7 @@ export default class Settings extends Component {
}
return (
<div className={ styles.layout }>
<div>
<Actionbar title='settings' className={ styles.bar }>
<Tabs className={ styles.tabs } value={ hash }>
{ this.renderTab(hash, 'views', <ImageRemoveRedEye />) }

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

@@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react';
import { addressLink } from '../../../../../3rdparty/etherscan/links';
import { addressLink } from '~/3rdparty/etherscan/links';
import styles from './AccountLink.css';
export default class AccountLink extends Component {

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

@@ -16,7 +16,7 @@
import React, { Component, PropTypes } from 'react';
import { txLink } from '../../../../3rdparty/etherscan/links';
import { txLink } from '~/3rdparty/etherscan/links';
export default class TxHashLink extends Component {

3
js/src/views/Signer/containers/Embedded/embedded.css
View File

@@ -23,9 +23,6 @@
width: $embedWidth;
}
.pending {
}
.none {
color: #aaa;
}

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

@@ -71,7 +71,7 @@ class Embedded extends Component {
const items = pending.sort(this._sortRequests).map(this.renderPending);
return (
<div className={ styles.pending }>
<div>
{ items }
</div>
);

6
js/src/views/Signer/containers/RequestsPage/RequestsPage.css
View File

@@ -15,12 +15,6 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.request {
}
.noRequestsMsg {
color: #aaa;
}
.items {
}

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

@@ -98,9 +98,7 @@ class RequestsPage extends Component {
return (
<Container title='Pending Requests'>
<div className={ styles.items }>
{ items }
</div>
{ items }
</Container>
);
}
@@ -111,7 +109,6 @@ class RequestsPage extends Component {
return (
<RequestPending
className={ styles.request }
onConfirm={ actions.startConfirmRequest }
onReject={ actions.startRejectRequest }
isSending={ isSending || false }

24
js/src/views/Signer/signer.css
View File

@@ -1,24 +0,0 @@
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
/* This file is part of Parity.
/*
/* Parity is free software: you can redistribute it and/or modify
/* it under the terms of the GNU General Public License as published by
/* the Free Software Foundation, either version 3 of the License, or
/* (at your option) any later version.
/*
/* Parity is distributed in the hope that it will be useful,
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/* GNU General Public License for more details.
/*
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.signer {
}
.container {
}
.mainContainer {
}

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

@@ -19,12 +19,10 @@ import React, { Component } from 'react';
import { Actionbar } from '~/ui';
import RequestsPage from './containers/RequestsPage';
import styles from './signer.css';
export default class Signer extends Component {
render () {
return (
<div className={ styles.signer }>
<div>
<Actionbar
title='Trusted Signer' />
<RequestsPage />

55
js/src/views/Status/components-compositors/Animated/AnimateChildren.css
View File

@@ -1,55 +0,0 @@
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
/* This file is part of Parity.
/*
/* Parity is free software: you can redistribute it and/or modify
/* it under the terms of the GNU General Public License as published by
/* the Free Software Foundation, either version 3 of the License, or
/* (at your option) any later version.
/*
/* Parity is distributed in the hope that it will be useful,
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/* GNU General Public License for more details.
/*
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
/* todo [adgo] - make local */
:global .transition-appear {
opacity: 0.01;
}
:global .transition-appear.transition-appear-active {
opacity: 1;
transition: opacity .3s ease-in-out;
}
:global .transition-enter {
opacity: 0.01;
}
:global .transition-enter.transition-enter-active {
opacity: 1;
transition: opacity .3s ease-in-out;
}
:global .transition-leave {
opacity: 1;
}
:global .transition-leave.transition-leave-active {
opacity: 0.01;
transition: opacity .3s ease-in-out;
}
:global .absoluteAnimationContainer {
position: relative;
}
:global .absoluteAnimationContainer > .transition-leave {
position: absolute;
top: 0;
left: 0;
right: 0;
width: 100%;
}

28
js/src/views/Status/components-compositors/Animated/Animated.js
View File

@@ -1,28 +0,0 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component } from 'react';
import AnimateChildren from './children';
export default Wrapped => class Animated extends Component {
render () {
return (
<AnimateChildren>
<Wrapped { ...this.props } />
</AnimateChildren>
);
}
};

63
js/src/views/Status/components-compositors/Animated/children.js
View File

@@ -1,63 +0,0 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import { isReactComponent } from '../../util/react';
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
import './AnimateChildren.css';
export default class AnimateChildren extends Component {
render () {
const className = this.props.absolute ? 'absoluteAnimationContainer' : '';
return (
<ReactCSSTransitionGroup
component='div'
className={ className }
transitionName='transition'
transitionAppear
transitionAppearTimeout={ 0 }
transitionLeaveTimeout={ 0 }
transitionEnterTimeout={ 0 }
>
{ this.renderChildren() }
</ReactCSSTransitionGroup>
);
}
renderChildren () {
const { children, isView } = this.props;
if (isView) {
return React.cloneElement(this.props.children, {
key: this.props.pathname
});
}
if (isReactComponent(children)) {
return React.cloneElement(this.props.children, { ...this.props });
}
return children;
}
static propTypes = {
children: PropTypes.any.isRequired,
pathname: PropTypes.string,
isView: PropTypes.bool,
absolute: PropTypes.bool
}
}

17
js/src/views/Status/components-compositors/Animated/index.js
View File

@@ -1,17 +0,0 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
export default from './Animated';

31
js/src/views/Status/components/Calls/Calls.js
View File

@@ -15,7 +15,6 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react';
import AnimateChildren from '../../components-compositors/Animated/children';
import Call from '../Call';
import CallsToolbar from '../CallsToolbar';
import styles from './Calls.css';
@@ -73,13 +72,11 @@ export default class Calls extends Component {
}
return (
<AnimateChildren>
<div { ...this._test('empty-wrapper') }>
<h3 className={ styles.historyInfo } { ...this._test('empty') }>
Fire up some calls and the results will be here.
</h3>
</div>
</AnimateChildren>
<div { ...this._test('empty-wrapper') }>
<h3 className={ styles.historyInfo } { ...this._test('empty') }>
Fire up some calls and the results will be here.
</h3>
</div>
);
}
@@ -90,17 +87,13 @@ export default class Calls extends Component {
return;
}
return (
<AnimateChildren>
{ calls.map((call, idx) => (
<Call
key={ calls.length - idx }
call={ call }
setActiveCall={ this.setActiveCall }
/>
)) }
</AnimateChildren>
);
return calls.map((call, idx) => (
<Call
key={ calls.length - idx }
call={ call }
setActiveCall={ this.setActiveCall }
/>
));
}
clearActiveCall = () => {

4
js/src/views/Status/containers/StatusPage/StatusPage.js
View File

@@ -23,8 +23,6 @@ import { clearStatusLogs, toggleStatusLogs, toggleStatusRefresh } from '~/redux/
import Debug from '../../components/Debug';
import Status from '../../components/Status';
import styles from './statusPage.css';
class StatusPage extends Component {
static propTypes = {
nodeStatus: PropTypes.object.isRequired,
@@ -41,7 +39,7 @@ class StatusPage extends Component {
render () {
return (
<div className={ styles.body }>
<div>
<Status { ...this.props } />
<Debug { ...this.props } />
</div>

18
js/src/views/Status/containers/StatusPage/statusPage.css
View File

@@ -1,18 +0,0 @@
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
/* This file is part of Parity.
/*
/* Parity is free software: you can redistribute it and/or modify
/* it under the terms of the GNU General Public License as published by
/* the Free Software Foundation, either version 3 of the License, or
/* (at your option) any later version.
/*
/* Parity is distributed in the hope that it will be useful,
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/* GNU General Public License for more details.
/*
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.body {
}