Skip to content

Commit 8ea88e8

Browse files
PolGuixePolGuixe
committed
updated breaking changes
1 parent 68eb63f commit 8ea88e8

File tree

9 files changed

+50
-35
lines changed

9 files changed

+50
-35
lines changed

‎src/components/AppBar/AppBar.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import React from 'react';
66
import PropTypes from 'prop-types';
7-
import { withStyles } from 'material-ui/styles';
8-
import MaterialUIAppBar from 'material-ui/AppBar';
7+
import { withStyles } from '@material-ui/core/styles';
8+
import MaterialUIAppBar from '@material-ui/core/AppBar';
99

1010

1111
import styles from './styles';

‎src/components/Footer/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { withStyles } from 'material-ui/styles';
3+
import { withStyles } from '@material-ui/core/styles';
44

55
import styles from './styles';
66

‎src/components/Layout/Layout.jsx

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import compose from 'recompose/compose';
4-
import { withStyles } from 'material-ui/styles';
4+
import { withStyles } from '@material-ui/core/styles';
55
import classNames from 'classnames';
6-
import Drawer from 'material-ui/Drawer';
7-
import withWidth, { isWidthDown } from 'material-ui/utils/withWidth';
6+
import Drawer from '@material-ui/core/Drawer';
7+
import withWidth, { isWidthDown } from '@material-ui/core/utils/withWidth';
88
import controllable from 'react-controllables';
99

1010
import styles from './styles';
@@ -122,8 +122,10 @@ class Layout extends React.PureComponent {
122122
(rightDrawerOpen && rightDrawerType === 'persistent'));
123123

124124
const mainClassnames = classNames(classes.main, {
125-
[`${classes.mainFixedAppBar}`]: appBarPosition === 'fixed' && !usingTwoRowAppBar,
126-
[`${classes.mainFixedTwoRowAppBar}`]: appBarPosition === 'fixed' && usingTwoRowAppBar,
125+
[`${classes.mainFixedAppBar}`]:
126+
appBarPosition === 'fixed' && !usingTwoRowAppBar,
127+
[`${classes.mainFixedTwoRowAppBar}`]:
128+
appBarPosition === 'fixed' && usingTwoRowAppBar,
127129
[`${classes.mainGrow}`]: mainGrow && !usingTwoRowAppBar,
128130
[`${classes.mainGrowTwoRowAppBar}`]: mainGrow && usingTwoRowAppBar,
129131
[`${classes.mainStickyFooter}`]: stickyFooter,
@@ -162,14 +164,18 @@ class Layout extends React.PureComponent {
162164
const drawerHeaderClassnames = classNames({
163165
[`${classes.drawerHeader}`]: !usingTwoRowAppBar,
164166
[`${classes.drawerHeaderTwoRowAppBar}`]: usingTwoRowAppBar,
165-
})
167+
});
166168

167169
// FIXME find a better way to inject the closeDrawer prop
168170
const leftDrawerContentWithProps = leftDrawerContent
169-
? React.cloneElement(leftDrawerContent, { closeDrawer: this.handleLeftDrawerClose })
171+
? React.cloneElement(leftDrawerContent, {
172+
closeDrawer: this.handleLeftDrawerClose,
173+
})
170174
: leftDrawerContent;
171175
const rightDrawerContentWithProps = rightDrawerContent
172-
? React.cloneElement(rightDrawerContent, { closeDrawer: this.handleRightDrawerClose })
176+
? React.cloneElement(rightDrawerContent, {
177+
closeDrawer: this.handleRightDrawerClose,
178+
})
173179
: rightDrawerContent;
174180

175181
return (

‎src/templates/AppBar/BasicAppBar/BasicAppBar.jsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import _ from 'lodash';
22
import React from 'react';
33
import PropTypes from 'prop-types';
4-
import IconButton from 'material-ui/IconButton';
5-
import Button from 'material-ui/Button';
6-
import Toolbar from 'material-ui/Toolbar';
7-
import Typography from 'material-ui/Typography';
8-
import MenuIcon from 'material-ui-icons/Menu';
9-
import Hidden from 'material-ui/Hidden';
10-
import { withStyles } from 'material-ui/styles';
11-
import withWidth, { isWidthDown } from 'material-ui/utils/withWidth';
4+
import IconButton from '@material-ui/core/IconButton';
5+
import Button from '@material-ui/core/Button';
6+
import Toolbar from '@material-ui/core/Toolbar';
7+
import Typography from '@material-ui/core/Typography';
8+
import MenuIcon from 'material-ui-@material-ui/icons/Menu';
9+
import Hidden from '@material-ui/core/Hidden';
10+
import { withStyles } from '@material-ui/core/styles';
11+
import withWidth, { isWidthDown } from '@material-ui/core/utils/withWidth';
1212
import compose from 'recompose/compose';
1313

1414
import styles from './styles';

‎src/templates/AppBar/TwoRowsAppBar/TwoRowsAppBar.jsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { PureComponent } from 'react';
22
import PropTypes from 'prop-types';
3-
import Toolbar from 'material-ui/Toolbar';
4-
import Grid from 'material-ui/Grid';
5-
import { withStyles } from 'material-ui/styles';
6-
import withWidth, { isWidthDown } from 'material-ui/utils/withWidth';
3+
import Toolbar from '@material-ui/core/Toolbar';
4+
import Grid from '@material-ui/core/Grid';
5+
import { withStyles } from '@material-ui/core/styles';
6+
import withWidth, { isWidthDown } from '@material-ui/core/utils/withWidth';
77
import classNames from 'classnames';
88
import compose from 'recompose/compose';
99

@@ -62,11 +62,17 @@ class TwoRowsAppBar extends PureComponent {
6262

6363
return (
6464
<Toolbar>
65-
<Grid container direction="column" className={classes.wrapper}>
65+
<Grid
66+
container
67+
direction="column"
68+
className={classes.wrapper}
69+
spacing={16}
70+
>
6671
<Grid
6772
container
6873
className={classNames(classes.row, classes.topRow)}
6974
justify={'space-between'}
75+
spacing={16}
7076
>
7177
<Grid
7278
item
@@ -108,6 +114,7 @@ class TwoRowsAppBar extends PureComponent {
108114
container
109115
className={classNames(classes.row, classes.bottomRow)}
110116
justify={'space-between'}
117+
spacing={16}
111118
>
112119
<Grid
113120
item

‎src/templates/Drawer/BasicDrawer/BasicDrawer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { withStyles } from 'material-ui/styles';
3+
import { withStyles } from '@material-ui/core/styles';
44

55
import DrawerItemsList from '../DrawerItemsList';
66

‎src/templates/Drawer/DrawerItemsList/DrawerItemsList.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import map from 'lodash/map';
22
import React from 'react';
33
import PropTypes from 'prop-types';
4-
import { withStyles } from 'material-ui/styles';
5-
import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List';
6-
import Icon from 'material-ui/Icon';
4+
import { withStyles } from '@material-ui/core/styles';
5+
import List, { ListItem, ListItemIcon, ListItemText } from '@material-ui/core/List';
6+
import Icon from '@material-ui/core/Icon';
77

88
import styles from './styles';
99

‎src/templates/Drawer/StandardDrawer/StandardDrawer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { withStyles } from 'material-ui/styles';
4-
import Divider from 'material-ui/Divider';
3+
import { withStyles } from '@material-ui/core/styles';
4+
import Divider from '@material-ui/core/Divider';
55

66
import DrawerItemsList from '../DrawerItemsList';
77

‎src/templates/Footer/BasicFooter/BasicFooter.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import _ from 'lodash';
22
import React from 'react';
33
import PropTypes from 'prop-types';
4-
import { withStyles } from 'material-ui/styles';
5-
import Grid from 'material-ui/Grid';
6-
import Typography from 'material-ui/Typography';
7-
import Button from 'material-ui/Button';
4+
import { withStyles } from '@material-ui/core/styles';
5+
import Grid from '@material-ui/core/Grid';
6+
import Typography from '@material-ui/core/Typography';
7+
import Button from '@material-ui/core/Button';
88

99
import styles from './styles';
1010

@@ -47,7 +47,9 @@ class BasicFooter extends React.PureComponent {
4747
<Grid item xs={12} md={4}>
4848
<Grid container direction="row" spacing={0} justify="center">
4949
{_.map(links, link => (
50-
<Button href={link.href} color="inherit" key={link.label}>{link.label}</Button>
50+
<Button href={link.href} color="inherit" key={link.label}>
51+
{link.label}
52+
</Button>
5153
))}
5254
</Grid>
5355
</Grid>

0 commit comments

Comments
 (0)