Merge pull request #189 from lern-edu/feature/upgrade-react

Feature/upgrade react #187
lern-edu · Jun 9, 2018 · c61a702 · c61a702
2 parents 602435c + 76ad9fa
commit c61a702
Show file tree

Hide file tree

Showing 70 changed files with 1,417 additions and 1,347 deletions.
diff --git a/client/views/Admin/Tag/Childrens/Childrens.jsx b/client/views/Admin/Tag/Childrens/Childrens.jsx
@@ -4,16 +4,16 @@ import log from 'loglevel';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { Tag } from 'meteor/duckdodgerbrasl:lern-model';
-import { withStyles } from 'material-ui/styles';
-import { LinearProgress } from 'material-ui/Progress';
-import Grid from 'material-ui/Grid';
-import Button from 'material-ui/Button';
-import Input, { InputLabel } from 'material-ui/Input';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import Divider from 'material-ui/Divider/Divider';
+import { withStyles } from '@material-ui/core/styles';
+import { LinearProgress } from '@material-ui/core';
+import Grid from '@material-ui/core/Grid';
+import Button from '@material-ui/core/Button';
+import { Input, InputLabel } from '@material-ui/core';
+import { FormControl, FormHelperText } from '@material-ui/core';
+import Divider from '@material-ui/core/Divider/Divider';
 
 import AdminTagChildrensList from './List.jsx';
-import Tab from 'material-ui/Tabs/Tab';
+import Tab from '@material-ui/core/Tab';
 
 // Styles
 const styles = theme => ({
@@ -43,7 +43,7 @@ class AdminTagChildrens extends React.Component {
     };
   };
 
-  componentWillMount() {
+  componentDidMount() {
     this.getTags(this.props.tagId);
   };
 
@@ -94,7 +94,7 @@ class AdminTagChildrens extends React.Component {
           };
         });
     });
-  }
+  };
 
   render() {
     const { doc, errors, collections, collections: { tags: { docs } } } = this.state;

diff --git a/client/views/Admin/Tag/Childrens/List.jsx b/client/views/Admin/Tag/Childrens/List.jsx
@@ -1,8 +1,8 @@
 // Libs
 import React from 'react';
 import _ from 'lodash';
-import List, { ListItem, ListItemText } from 'material-ui/List';
-import Avatar from 'material-ui/Avatar';
+import { List, ListItem, ListItemText } from '@material-ui/core';
+import Avatar from '@material-ui/core/Avatar';
 
 class AdminTagChildrensList extends React.Component {
 

diff --git a/client/views/Admin/Tag/View.jsx b/client/views/Admin/Tag/View.jsx
@@ -6,14 +6,14 @@ import _ from 'lodash';
 import { Layout } from 'meteor/duckdodgerbrasl:lern-layouts';
 import { Tag } from 'meteor/duckdodgerbrasl:lern-model';
 import { Regex } from 'meteor/duckdodgerbrasl:lern-check';
-import { withStyles } from 'material-ui/styles';
-import { LinearProgress } from 'material-ui/Progress';
-import Grid from 'material-ui/Grid';
-import Paper from 'material-ui/Paper';
-import Button from 'material-ui/Button';
-import Input, { InputLabel } from 'material-ui/Input';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import Divider from 'material-ui/Divider/Divider';
+import { withStyles } from '@material-ui/core/styles';
+import { LinearProgress } from '@material-ui/core';
+import Grid from '@material-ui/core/Grid';
+import Paper from '@material-ui/core/Paper';
+import Button from '@material-ui/core/Button';
+import { Input, InputLabel } from '@material-ui/core';
+import { FormControl, FormHelperText } from '@material-ui/core';
+import Divider from '@material-ui/core/Divider/Divider';
 
 import AdminTagChildrens from './Childrens/Childrens.jsx';
 
@@ -58,7 +58,7 @@ class AdminTag extends React.Component {
     return false;
   };
 
-  componentWillMount() {
+  componentDidMount() {
     log.info('AdminTag.componentWillMount');
     this.getTags(this.props.tagId);
   };
@@ -214,7 +214,7 @@ class AdminTag extends React.Component {
                           justify='flex-end'
                         >
                           <Grid item>
-                            <Button href={FlowRouter.path('AdminTags')} raised>
+                            <Button href={FlowRouter.path('AdminTags')} variant="raised">
                               Cancel
                             </Button>
                           </Grid>
@@ -224,7 +224,7 @@ class AdminTag extends React.Component {
                           </Grid>
 
                           <Grid item>
-                            <Button onClick={this.handleSubmit} raised color='primary'>
+                            <Button onClick={this.handleSubmit} variant="raised" color='primary'>
                               Save
                             </Button>
                           </Grid>

diff --git a/client/views/Admin/Tags/List.jsx b/client/views/Admin/Tags/List.jsx
@@ -1,11 +1,11 @@
 // Libs
 import React from 'react';
 import _ from 'lodash';
-import List, { ListItem, ListItemText, ListItemSecondaryAction } from 'material-ui/List';
-import Avatar from 'material-ui/Avatar';
-import Paper from 'material-ui/Paper';
-import IconButton from 'material-ui/IconButton';
-import { Delete } from 'material-ui-icons';
+import { List, ListItem, ListItemText, ListItemSecondaryAction } from '@material-ui/core';
+import Avatar from '@material-ui/core/Avatar';
+import Paper from '@material-ui/core/Paper';
+import IconButton from '@material-ui/core/IconButton';
+import { Delete } from '@material-ui/icons';
 
 class AdminTagsList extends React.Component {
 

diff --git a/client/views/Admin/Tags/View.jsx b/client/views/Admin/Tags/View.jsx
@@ -2,13 +2,13 @@
 import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import TextField from 'material-ui/TextField';
-import AppBar from 'material-ui/AppBar';
-import Icon from 'material-ui/Icon';
-import Button from 'material-ui/Button';
-import Toolbar from 'material-ui/Toolbar';
-import { LinearProgress } from 'material-ui/Progress';
-import { withStyles } from 'material-ui/styles';
+import TextField from '@material-ui/core/TextField';
+import AppBar from '@material-ui/core/AppBar';
+import Icon from '@material-ui/core/Icon';
+import Button from '@material-ui/core/Button';
+import Toolbar from '@material-ui/core/Toolbar';
+import { LinearProgress } from '@material-ui/core';
+import { withStyles } from '@material-ui/core/styles';
 import { Layout, Snackbar } from 'meteor/duckdodgerbrasl:lern-layouts';
 
 import AdminTagsList from './List.jsx';
@@ -40,7 +40,7 @@ class AdminTags extends React.Component {
     };
   }
 
-  componentWillMount() {
+  componentDidMount() {
     this.getTags();
   }
 
@@ -90,7 +90,7 @@ class AdminTags extends React.Component {
         }
 
         <Button
-          fab
+          variant="fab"
           color="primary"
           aria-label="add"
           href={FlowRouter.path('AdminTag')}

diff --git a/client/views/Admin/Test/Number.jsx b/client/views/Admin/Test/Number.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import Input, { InputLabel } from 'material-ui/Input';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import { withStyles } from 'material-ui/styles';
+import { Input, InputLabel } from '@material-ui/core';
+import { FormControl, FormHelperText } from '@material-ui/core';
+import { withStyles } from '@material-ui/core/styles';
 
 // Styles
 const styles = theme => ({

diff --git a/client/views/Admin/Test/Page.jsx b/client/views/Admin/Test/Page.jsx
@@ -2,17 +2,17 @@ import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import { StaticCollections, Test, Content } from 'meteor/duckdodgerbrasl:lern-model';
-import Grid from 'material-ui/Grid';
-import Divider from 'material-ui/Divider';
-import Paper from 'material-ui/Paper';
-import Dialog from 'material-ui/Dialog';
-import AppBar from 'material-ui/AppBar';
-import Toolbar from 'material-ui/Toolbar';
-import IconButton from 'material-ui/IconButton';
-import Typography from 'material-ui/Typography';
-import CloseIcon from 'material-ui-icons/Close';
-import Slide from 'material-ui/transitions/Slide';
-import { withStyles } from 'material-ui/styles';
+import Grid from '@material-ui/core/Grid';
+import Divider from '@material-ui/core/Divider';
+import Paper from '@material-ui/core/Paper';
+import Dialog from '@material-ui/core/Dialog';
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import IconButton from '@material-ui/core/IconButton';
+import Typography from '@material-ui/core/Typography';
+import CloseIcon from '@material-ui/icons/Close';
+import Slide from '@material-ui/core/Slide';
+import { withStyles } from '@material-ui/core/styles';
 
 const content = new Content();
 const ContentCreate = _.get(content, 'templates.ContentCreate');
@@ -55,7 +55,7 @@ class AdminTestPage extends React.Component {
             <IconButton color="inherit" onClick={this.props.handleClose}>
               <CloseIcon />
             </IconButton>
-            <Typography type='title' color="inherit" className={classes.flex}>
+            <Typography variant='title' color="inherit" className={classes.flex}>
               Página {(index + 1)}
             </Typography>
           </Toolbar>

diff --git a/client/views/Admin/Test/Pages.jsx b/client/views/Admin/Test/Pages.jsx
@@ -2,10 +2,10 @@ import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import { StaticCollections, Test, Content } from 'meteor/duckdodgerbrasl:lern-model';
-import { Grid, Divider, Paper, Button, IconButton } from 'material-ui';
-import Card, { CardHeader, CardContent, CardActions } from 'material-ui/Card';
-import { withStyles } from 'material-ui/styles';
-import { ChevronLeft, ChevronRight, Edit, RemoveCircle } from 'material-ui-icons';
+import { Grid, Divider, Paper, Button, IconButton } from '@material-ui/core';
+import { Card, CardHeader, CardContent, CardActions } from '@material-ui/core';
+import { withStyles } from '@material-ui/core/styles';
+import { ChevronLeft, ChevronRight, Edit, RemoveCircle } from '@material-ui/icons';
 
 const content = new Content();
 const ContentCreate = _.get(content, 'templates.ContentCreate');

diff --git a/client/views/Admin/Test/Scores.jsx b/client/views/Admin/Test/Scores.jsx
@@ -2,16 +2,18 @@
 import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-import List, { ListItem, ListItemText, ListItemSecondaryAction } from 'material-ui/List';
-import Checkbox from 'material-ui/Checkbox';
-import Avatar from 'material-ui/Avatar';
-import Paper from 'material-ui/Paper';
-import Dialog, { DialogTitle, DialogContent, DialogActions } from 'material-ui/Dialog';
-import Input from 'material-ui/Input';
-import Button from 'material-ui/Button';
-import Slide from 'material-ui/transitions/Slide';
+import { withStyles } from '@material-ui/core/styles';
+import { List, ListItem, ListItemText, ListItemSecondaryAction } from '@material-ui/core';
+import Checkbox from '@material-ui/core/Checkbox';
+import Avatar from '@material-ui/core/Avatar';
+import Paper from '@material-ui/core/Paper';
+import { Dialog,  DialogTitle, DialogContent, DialogActions } from '@material-ui/core';
+import Input from '@material-ui/core/Input';
+import Select from '@material-ui/core/Select';
+import Button from '@material-ui/core/Button';
+import Slide from '@material-ui/core/Slide';
 import { Test } from 'meteor/duckdodgerbrasl:lern-model';
+import { MenuItem } from '@material-ui/core';
 
 function Transition(props) {
   return <Slide direction="up" {...props} />;
@@ -91,7 +93,7 @@ class AdminTestScores extends React.Component {
 
     return (
       <div>
-        
+
         <List className={classes.root}>
 
           {
@@ -120,9 +122,9 @@ class AdminTestScores extends React.Component {
           aria-labelledby='Score a tag'
           open={open}
         >
-          
+
           <DialogTitle id='scores-title'>Set score proportion</DialogTitle>
-          
+
           <DialogContent>
 
             <Input
@@ -143,15 +145,15 @@ class AdminTestScores extends React.Component {
             <Button onClick={this.handleClose('cancel')} color="secondary">
               Cancel
             </Button>
-            
+
             <Button onClick={this.handleClose('save')} color="primary">
               Save
             </Button>
 
           </DialogActions>
 
         </Dialog>
-      
+
       </div>
     );
   }

diff --git a/client/views/Admin/Test/Select.jsx b/client/views/Admin/Test/Select.jsx
@@ -1,17 +1,17 @@
 import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import Input, { InputLabel } from 'material-ui/Input';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import Select from 'material-ui/Select';
-import { MenuItem } from 'material-ui/Menu';
+import { Input, InputLabel } from '@material-ui/core';
+import { FormControl, FormHelperText } from '@material-ui/core';
+import Select from '@material-ui/core/Select';
+import { MenuItem } from '@material-ui/core';
 
 const ITEM_HEIGHT = 48;
 const ITEM_PADDING_TOP = 8;
 
 class AdminTestSelect extends React.Component {
 
-  componentWillMount() {
+  componentDidMount() {
     const { doc, field, parent } = this.props;
     doc.validate({ fields: [field] }, (err) => {
       if (err) parent.setState({ errors: { [field]: { message: err.reason, error: true } } });

diff --git a/client/views/Admin/Test/Text.jsx b/client/views/Admin/Test/Text.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import Input, { InputLabel } from 'material-ui/Input';
-import { FormControl, FormHelperText } from 'material-ui/Form';
-import { withStyles } from 'material-ui/styles';
+import { Input, InputLabel } from '@material-ui/core';
+import { FormControl, FormHelperText } from '@material-ui/core';
+import { withStyles } from '@material-ui/core/styles';
 
 // Styles
 const styles = theme => ({
@@ -53,4 +53,4 @@ AdminTestText.propTypes = {
   field: PropTypes.string.isRequired,
 };
 
-export default withStyles(styles)(AdminTestText);
+export default withStyles(styles)(AdminTestText);
diff --git a/client/views/Admin/Test/Time.jsx b/client/views/Admin/Test/Time.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import { StaticCollections, Test } from 'meteor/duckdodgerbrasl:lern-model';
-import Grid from 'material-ui/Grid';
+import Grid from '@material-ui/core/Grid';
 
 import AdminTestSelect from './Select.jsx';
 

diff --git a/client/views/Admin/Test/Timeout.jsx b/client/views/Admin/Test/Timeout.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
+import { withStyles } from '@material-ui/core/styles';
 import { StaticCollections, Test } from 'meteor/duckdodgerbrasl:lern-model';
-import Grid from 'material-ui/Grid';
-import { TextField, Select, MenuItem, FormControl, InputLabel } from 'material-ui';
+import Grid from '@material-ui/core/Grid';
+import { TextField, Select, MenuItem, FormControl, InputLabel } from '@material-ui/core';
 
 import AdminTestSelect from './Select.jsx';
 import AdminTestNumber from './Number.jsx';