Skip to content

Commit b81e4a0

Browse files
author
spoeck
committed
update version of material-ui to rc.0
1 parent cdd018c commit b81e4a0

File tree

9 files changed

+4296
-5945
lines changed

9 files changed

+4296
-5945
lines changed

‎package-lock.json

Lines changed: 4267 additions & 5895 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"version": "0.0.1",
44
"private": true,
55
"dependencies": {
6-
"material-ui": "1.0.0-beta.44",
7-
"material-ui-icons": "^1.0.0-beta.36",
6+
"@material-ui/core": "^1.0.0-rc.0",
7+
"@material-ui/icons": "^1.0.0-rc.0",
88
"npm": "^5.7.1",
9-
"react": "16.2.0",
9+
"react": "16.3.2",
1010
"react-dom": "16.3.2",
1111
"react-redux": "^5.0.7",
1212
"react-router": "^4.2.0",

‎src/App.tsx

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1+
import { AppBar, Badge, Divider, Drawer, Hidden, IconButton, List, ListItem, ListItemIcon, ListItemText, StyleRulesCallback, Toolbar, Typography, WithStyles, withStyles } from '@material-ui/core';
2+
import TodoIcon from '@material-ui/icons/FormatListNumbered';
3+
import HomeIcon from '@material-ui/icons/Home';
4+
import MenuIcon from '@material-ui/icons/Menu';
5+
import { createBrowserHistory } from 'history';
16
import * as React from 'react';
2-
import withStyles, { WithStyles, StyleRulesCallback } from 'material-ui/styles/withStyles';
3-
import withRoot from './withRoot';
7+
import { connect } from 'react-redux';
8+
import { Route, RouteComponentProps, Router } from 'react-router';
9+
import { Todo } from './model/model';
410
import HomePage from './pages/HomePage';
511
import TodoPage from './pages/TodoPage';
6-
import { Router, Route, RouteComponentProps } from 'react-router';
7-
import { createBrowserHistory } from 'history';
8-
import AppBar from 'material-ui/AppBar';
9-
import Toolbar from 'material-ui/Toolbar';
10-
import IconButton from 'material-ui/IconButton';
11-
import Typography from 'material-ui/Typography';
12-
import Drawer from 'material-ui/Drawer';
13-
import Hidden from 'material-ui/Hidden';
14-
import Divider from 'material-ui/Divider';
15-
import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List';
16-
import MenuIcon from 'material-ui-icons/Menu';
17-
import HomeIcon from 'material-ui-icons/Home';
18-
import TodoIcon from 'material-ui-icons/FormatListNumbered';
19-
import Badge from 'material-ui/Badge/Badge';
2012
import { RootState } from './reducers/index';
21-
import { connect } from 'react-redux';
22-
import { Todo } from './model/model';
13+
import withRoot from './withRoot';
2314

2415
export namespace App {
2516
export interface Props extends RouteComponentProps<void> {

‎src/components/TodoDialog.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1+
import { Button, Dialog, DialogActions, DialogTitle, StyleRulesCallback, TextField, WithStyles, withStyles } from '@material-ui/core';
12
import * as React from 'react';
2-
import Dialog, {
3-
DialogTitle,
4-
DialogActions,
5-
} from 'material-ui/Dialog';
6-
import withStyles, { WithStyles, StyleRulesCallback } from 'material-ui/styles/withStyles';
73
import * as TodoActions from '../actions/todo';
8-
import TextField from 'material-ui/TextField/TextField';
9-
import Button from 'material-ui/Button/Button';
104

115
export namespace TodoDialog {
126
export interface Props {

‎src/components/TodoTable.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1+
import { Checkbox, IconButton, Paper, StyleRulesCallback, Table, TableBody, TableCell, TableHead, TableRow, WithStyles, withStyles } from '@material-ui/core';
2+
import DeleteIcon from '@material-ui/icons/Delete';
13
import * as React from 'react';
2-
import { Todo } from '../model/model';
3-
import Table, { TableBody, TableCell, TableHead, TableRow } from 'material-ui/Table';
4-
import Paper from 'material-ui/Paper';
5-
import withStyles, { WithStyles, StyleRulesCallback } from 'material-ui/styles/withStyles';
6-
import Checkbox from 'material-ui/Checkbox/Checkbox';
74
import * as TodoActions from '../actions/todo';
8-
import IconButton from 'material-ui/IconButton/IconButton';
9-
import DeleteIcon from 'material-ui-icons/Delete';
5+
import { Todo } from '../model/model';
106

117
export namespace TodoTable {
128
export interface Props {

‎src/pages/HomePage.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
import { StyleRulesCallback, Typography, WithStyles, withStyles } from '@material-ui/core';
12
import * as React from 'react';
2-
import Typography from 'material-ui/Typography';
3-
import withStyles, { WithStyles, StyleRulesCallback } from 'material-ui/styles/withStyles';
4-
import { RootState } from '../reducers';
53
import { connect } from 'react-redux';
64
import { RouteComponentProps } from 'react-router';
75
import { Todo } from '../model/model';
6+
import { RootState } from '../reducers';
87

98
export namespace HomePage {
109
export interface Props extends RouteComponentProps<void> {

‎src/pages/TodoPage.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1+
import { Button, Grid, StyleRulesCallback, Typography, WithStyles, withStyles } from '@material-ui/core';
12
import * as React from 'react';
2-
import Button from 'material-ui/Button';
3-
import Typography from 'material-ui/Typography';
4-
import withStyles, { WithStyles, StyleRulesCallback } from 'material-ui/styles/withStyles';
5-
import TodoTable from '../components';
6-
import { RootState } from '../reducers/index';
7-
import * as TodoActions from '../actions/todo';
83
import { connect } from 'react-redux';
9-
import { bindActionCreators } from 'redux';
10-
import { Todo } from '../model/model';
114
import { RouteComponentProps } from 'react-router';
12-
import Grid from 'material-ui/Grid';
5+
import { bindActionCreators } from 'redux';
6+
import * as TodoActions from '../actions/todo';
7+
import TodoTable from '../components';
138
import TodoDialog from '../components/TodoDialog';
9+
import { Todo } from '../model/model';
10+
import { RootState } from '../reducers/index';
1411

1512
export namespace TodoPage {
1613
export interface Props extends RouteComponentProps<void> {

‎src/withRoot.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import { CssBaseline, MuiThemeProvider, createMuiTheme } from '@material-ui/core';
12
import * as React from 'react';
2-
import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
3-
import CssBaseline from 'material-ui/CssBaseline';
43

54
// A theme with custom primary and secondary color.
65
// It's optional.

‎tslint.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
"label-position": true,
3535
"max-line-length": [
3636
true,
37-
120
37+
{
38+
"limit": 120,
39+
"ignore-pattern": "^import {(.*?)}"
40+
}
3841
],
3942
"member-ordering": [
4043
true,

0 commit comments

Comments
 (0)