Semantic ui (#5507)

* semantic addition

* semantic addition

* semantic-ui into @parity/ui dependency

* Merge updates

* Update missing imports to use ~

* Clean @parity modules with clean

* Updated yarn.lock
This commit is contained in:
Craig O'Connor 2017-04-26 07:12:50 -04:00 committed by Jaco Greeff
parent 6797172ad4
commit 2badd9778b
9 changed files with 468 additions and 365 deletions

View File

@ -27,6 +27,8 @@ import injectTapEventPlugin from 'react-tap-event-plugin';
import { IndexRoute, Redirect, Route, Router, hashHistory } from 'react-router'; import { IndexRoute, Redirect, Route, Router, hashHistory } from 'react-router';
import qs from 'querystring'; import qs from 'querystring';
import '@parity/ui';
import SecureApi from '~/secureApi'; import SecureApi from '~/secureApi';
import ContractInstances from '~/contracts'; import ContractInstances from '~/contracts';

View File

@ -15,19 +15,25 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { FlatButton } from 'material-ui'; import { Button as SemButton } from 'semantic-ui-react';
import { nodeOrStringProptype } from '~/util/proptypes'; import { nodeOrStringProptype } from '~/util/proptypes';
export default class Button extends Component { export default class Button extends Component {
static propTypes = { static propTypes = {
active: PropTypes.bool,
animated: PropTypes.bool,
basic: PropTypes.bool,
backgroundColor: PropTypes.string, backgroundColor: PropTypes.string,
className: PropTypes.string, className: PropTypes.string,
color: PropTypes.string,
disabled: PropTypes.bool, disabled: PropTypes.bool,
icon: PropTypes.node, icon: PropTypes.node,
label: nodeOrStringProptype(), label: nodeOrStringProptype(),
onClick: PropTypes.func, onClick: PropTypes.func,
primary: PropTypes.bool primary: PropTypes.bool,
size: PropTypes.string,
toggle: PropTypes.bool
} }
static defaultProps = { static defaultProps = {
@ -35,17 +41,35 @@ export default class Button extends Component {
} }
render () { render () {
const { className, backgroundColor, disabled, icon, label, primary, onClick } = this.props; const {
active,
animated,
basic,
className,
color,
disabled,
icon,
label,
onClick,
primary,
size,
toggle
} = this.props;
return ( return (
<FlatButton <SemButton
active={ active }
animated={ animated }
basic={ basic }
className={ className } className={ className }
backgroundColor={ backgroundColor } color={ color }
disabled={ disabled } disabled={ disabled }
icon={ icon } icon={ icon }
label={ label } content={ label }
onClick={ onClick }
primary={ primary } primary={ primary }
onTouchTap={ onClick } size={ size }
toggle={ toggle }
/> />
); );
} }

View File

@ -19,7 +19,7 @@ import { connect } from 'react-redux';
import { hashToImageUrl } from '~/redux/providers/imagesReducer'; import { hashToImageUrl } from '~/redux/providers/imagesReducer';
import defaultIcon from '../../../assets/images/certifications/unknown.svg'; import defaultIcon from '~/../assets/images/certifications/unknown.svg';
import styles from './certifications.css'; import styles from './certifications.css';

View File

@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
import { IntlProvider } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import { LocaleStore } from '../../i18n'; import { LocaleStore } from '~/i18n';
@observer @observer
export default class ContextProvider extends Component { export default class ContextProvider extends Component {

View File

@ -14,6 +14,8 @@
// 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 'semantic-ui-css/semantic.min.css';
export AccountCard from './AccountCard'; export AccountCard from './AccountCard';
export Actionbar, { Export as ActionbarExport, Import as ActionbarImport, Search as ActionbarSearch, Sort as ActionbarSort } from './Actionbar'; export Actionbar, { Export as ActionbarExport, Import as ActionbarImport, Search as ActionbarSearch, Sort as ActionbarSort } from './Actionbar';
export Badge from './Badge'; export Badge from './Badge';

View File

@ -6,7 +6,8 @@
"author": "Parity Team <admin@parity.io>", "author": "Parity Team <admin@parity.io>",
"maintainers": [ "maintainers": [
"Jaco Greeff", "Jaco Greeff",
"Nicolas Gotchac" "Nicolas Gotchac",
"Craig O'Connor"
], ],
"contributors": [], "contributors": [],
"license": "GPL-3.0", "license": "GPL-3.0",
@ -35,6 +36,8 @@
"react-portal": "3.0.0", "react-portal": "3.0.0",
"react-qr-reader": "1.0.3", "react-qr-reader": "1.0.3",
"recharts": "0.15.2", "recharts": "0.15.2",
"semantic-ui-css": "2.2.10",
"semantic-ui-react": "0.68.2",
"zxcvbn": "4.4.1" "zxcvbn": "4.4.1"
}, },
"peerDependencies": { "peerDependencies": {

View File

@ -23,8 +23,8 @@ import { bindActionCreators } from 'redux';
import { newError } from '~/redux/actions'; import { newError } from '~/redux/actions';
import shapeshiftBtn from '~/../assets/images/shapeshift-btn.png'; import shapeshiftBtn from '~/../assets/images/shapeshift-btn.png';
import HardwareStore from '~/mobx/hardwareStore'; import HardwareStore from '~/mobx/hardwareStore';
import HistoryStore from '~/mobx/historyStore';
import ExportStore from '~/modals/ExportAccount/exportStore'; import ExportStore from '~/modals/ExportAccount/exportStore';
import HistoryStore from '~/mobx/historyStore';
import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals'; import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals';
import { setVisibleAccounts } from '~/redux/providers/personalActions'; import { setVisibleAccounts } from '~/redux/providers/personalActions';
import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions'; import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions';

View File

@ -126,7 +126,7 @@ module.exports = {
use: [ 'file-loader?&name=assets/[name].[hash:10].[ext]' ] use: [ 'file-loader?&name=assets/[name].[hash:10].[ext]' ]
}, },
{ {
test: /\.(woff(2)|ttf|eot|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, test: /\.(woff|woff2|ttf|eot|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
use: [ 'file-loader?name=fonts/[name][hash:10].[ext]' ] use: [ 'file-loader?name=fonts/[name][hash:10].[ext]' ]
}, },
{ {

File diff suppressed because it is too large Load Diff