Skip to content
Permalink
Browse files

Updated material-ui to v4

  • Loading branch information...
devias-io committed May 11, 2019
1 parent 7ab0afe commit ce2213339985dbf06f34ef3022ca3107d91435c9
Showing with 3,724 additions and 3,711 deletions.
  1. +0 −1 .env
  2. +6 −0 jsconfig.json
  3. +29 −24 package.json
  4. +9 −5 src/App.jsx
  5. +4 −5 src/components/DisplayMode/index.jsx
  6. +2 −2 src/components/Paper/index.jsx
  7. +1 −1 src/components/Portlet/index.jsx
  8. +1 −1 src/components/PortletContent/index.jsx
  9. +1 −1 src/components/PortletFooter/index.jsx
  10. +1 −1 src/components/PortletHeader/index.jsx
  11. +2 −2 src/components/PortletLabel/index.jsx
  12. +1 −1 src/components/PortletToolbar/index.jsx
  13. +5 −3 src/components/SearchInput/index.jsx
  14. +1 −1 src/components/Status/index.jsx
  15. +10 −0 src/components/index.jsx
  16. +5 −2 src/helpers/chartjs.js
  17. +2 −0 src/helpers/index.js
  18. +1 −1 src/icons/Facebook/index.jsx
  19. +1 −1 src/icons/Google/index.jsx
  20. +2 −0 src/icons/index.jsx
  21. +2 −3 src/layouts/Dashboard/components/Footer/index.jsx
  22. +29 −23 src/layouts/Dashboard/components/Sidebar/index.jsx
  23. +20 −15 src/layouts/Dashboard/components/Topbar/components/NotificationList/index.jsx
  24. +1 −1 src/layouts/Dashboard/components/Topbar/components/NotificationList/styles.jsx
  25. +1 −0 src/layouts/Dashboard/components/Topbar/components/index.jsx
  26. +18 −12 src/layouts/Dashboard/components/Topbar/index.jsx
  27. +3 −0 src/layouts/Dashboard/components/index.jsx
  28. +6 −9 src/layouts/Dashboard/index.jsx
  29. +1 −0 src/layouts/index.jsx
  30. +1 −1 src/theme/index.js
  31. +1 −1 src/theme/overrides/MuiFilledInput.js
  32. +12 −0 src/theme/overrides/MuiLinearProgress.js
  33. +2 −1 src/theme/overrides/MuiListItemIcon.js
  34. +2 −0 src/theme/overrides/index.js
  35. +1 −1 src/theme/palette.js
  36. +9 −1 src/theme/typography.js
  37. +11 −11 src/views/Account/components/AccountDetails/index.jsx
  38. +3 −12 src/views/Account/components/AccountProfile/index.jsx
  39. +0 −8 src/views/Account/components/AccountProfile/styles.jsx
  40. +2 −0 src/views/Account/components/index.jsx
  41. +5 −6 src/views/Account/index.jsx
  42. +10 −6 src/views/Dashboard/components/Budget/index.jsx
  43. +16 −12 src/views/Dashboard/components/DevicesChart/index.jsx
  44. +20 −16 src/views/Dashboard/components/OrdersTable/index.jsx
  45. +21 −13 src/views/Dashboard/components/ProductList/index.jsx
  46. +7 −5 src/views/Dashboard/components/Profit/index.jsx
  47. +7 −6 src/views/Dashboard/components/Progress/index.jsx
  48. +16 −10 src/views/Dashboard/components/SalesChart/index.jsx
  49. +10 −6 src/views/Dashboard/components/Users/index.jsx
  50. +8 −0 src/views/Dashboard/components/index.jsx
  51. +14 −12 src/views/Dashboard/index.jsx
  52. +2 −2 src/views/Icons/index.jsx
  53. +3 −4 src/views/NotFound/index.jsx
  54. +10 −7 src/views/ProductList/components/ProductCard/index.jsx
  55. +4 −5 src/views/ProductList/components/ProductsToolbar/index.jsx
  56. +2 −0 src/views/ProductList/components/index.jsx
  57. +18 −13 src/views/ProductList/index.jsx
  58. +9 −9 src/views/Settings/components/Notifications/index.jsx
  59. +9 −8 src/views/Settings/components/Password/index.jsx
  60. +2 −0 src/views/Settings/components/index.jsx
  61. +5 −6 src/views/Settings/index.jsx
  62. +12 −10 src/views/SignIn/index.jsx
  63. +12 −9 src/views/SignUp/index.jsx
  64. +10 −7 src/views/Typography/index.jsx
  65. +3 −4 src/views/UnderDevelopment/index.jsx
  66. +14 −13 src/views/UserList/components/UsersTable/index.jsx
  67. +13 −11 src/views/UserList/components/UsersToolbar/index.jsx
  68. +2 −0 src/views/UserList/components/index.jsx
  69. +4 −6 src/views/UserList/index.jsx
  70. +3,247 −3,354 yarn.lock
1 .env

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,6 @@
{
"compilerOptions": {
"baseUrl": "src"
},
"include": ["src"]
}
@@ -2,46 +2,51 @@
"name": "react-material-dashboard",
"version": "0.1.1",
"private": true,
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"dependencies": {
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.2",
"@material-ui/styles": "^3.0.0-alpha.10",
"@material-ui/core": "^4.0.0-beta.1",
"@material-ui/icons": "^4.0.0-beta.0",
"@material-ui/styles": "^4.0.0-beta.1",
"chart.js": "^2.7.3",
"classnames": "^2.2.6",
"history": "^4.7.2",
"moment": "^2.24.0",
"node-sass": "^4.11.0",
"prop-types": "^15.7.1",
"react": "^16.8.1",
"react": "^16.8.6",
"react-chartjs-2": "^2.7.4",
"react-dom": "^16.8.1",
"react-dom": "^16.8.6",
"react-perfect-scrollbar": "^1.4.4",
"react-router-config": "^5.0.0",
"react-router-dom": "^4.3.1",
"react-scripts": "2.1.5",
"react-router-dom": "^5.0.0",
"react-scripts": "3.0.1",
"recompose": "^0.30.0",
"underscore": "^1.9.1",
"validate.js": "^0.12.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"devDependencies": {
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.4",
"prettier-eslint": "^8.8.2",
"prettier-eslint-cli": "^4.7.1"
}
}
}
@@ -6,13 +6,15 @@ import { createBrowserHistory } from 'history';
import { Chart } from 'react-chartjs-2';

// Material helpers
import { MuiThemeProvider } from '@material-ui/core/styles';
import { ThemeProvider } from '@material-ui/styles';

// ChartJS helpers
import { draw } from './helpers/chartjs';
import { chartjs } from './helpers';

// Theme
import theme from './theme';

// Styles
import 'react-perfect-scrollbar/dist/css/styles.css';
import './assets/scss/index.scss';

@@ -23,16 +25,18 @@ import Routes from './Routes';
const browserHistory = createBrowserHistory();

// Configure ChartJS
Chart.helpers.extend(Chart.elements.Rectangle.prototype, { draw });
Chart.helpers.extend(Chart.elements.Rectangle.prototype, {
draw: chartjs.draw
});

export default class App extends Component {
render() {
return (
<MuiThemeProvider theme={theme}>
<ThemeProvider theme={theme}>
<Router history={browserHistory}>
<Routes />
</Router>
</MuiThemeProvider>
</ThemeProvider>
);
}
}
@@ -5,11 +5,10 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Material components
import ListOutlinedIcon from '@material-ui/icons/ListOutlined';
import AppsOutlinedIcon from '@material-ui/icons/AppsOutlined';
import { List as ListIcon, Apps as AppsIcon } from '@material-ui/icons';

// Component styles
import styles from './styles';
@@ -28,7 +27,7 @@ const DisplayMode = props => {
})}
onClick={onChange}
>
<AppsOutlinedIcon className={classes.displayIcon} />
<AppsIcon className={classes.displayIcon} />
</span>
<span className={classes.divider} />
<span
@@ -38,7 +37,7 @@ const DisplayMode = props => {
})}
onClick={onChange}
>
<ListOutlinedIcon className={classes.displayIcon} />
<ListIcon className={classes.displayIcon} />
</span>
</div>
);
@@ -5,10 +5,10 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Material components
import Paper from '@material-ui/core/Paper';
import { Paper } from '@material-ui/core';

// Component styles
const styles = theme => {
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Shared components
import Paper from '../Paper';
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Component styles
const styles = theme => ({
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Component styles
const styles = theme => ({
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Component styles
const styles = theme => ({
@@ -5,10 +5,10 @@ import classNames from 'classnames';
import PropTypes from 'prop-types';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Material components
import Typography from '@material-ui/core/Typography';
import { Typography } from '@material-ui/core';

const styles = theme => ({
root: {
@@ -5,7 +5,7 @@ import classNames from 'classnames';
import PropTypes from 'prop-types';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

const styles = () => ({
root: {
@@ -5,11 +5,13 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Material components
import Input from '@material-ui/core/Input';
import SearchIcon from '@material-ui/icons/Search';
import { Input } from '@material-ui/core';

// Material icons
import { Search as SearchIcon } from '@material-ui/icons';

// Component styles
import styles from './styles';
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

const styles = theme => ({
root: {
@@ -0,0 +1,10 @@
export { default as DisplayMode } from './DisplayMode';
export { default as Paper } from './Paper';
export { default as Portlet } from './Portlet';
export { default as PortletContent } from './PortletContent';
export { default as PortletFooter } from './PortletFooter';
export { default as PortletHeader } from './PortletHeader';
export { default as PortletLabel } from './PortletLabel';
export { default as PortletToolbar } from './PortletToolbar';
export { default as SearchInput } from './SearchInput';
export { default as Status } from './Status';
@@ -1,7 +1,6 @@
// ChartJS extension rounded bar chart
// https://codepen.io/jedtrow/full/ygRYgo

export function draw() {
function draw() {
const { ctx } = this._chart;
const vm = this._view;
let { borderWidth } = vm;
@@ -187,3 +186,7 @@ export function draw() {
ctx.stroke();
}
}

export default {
draw
};
@@ -0,0 +1,2 @@
export { default as chartjs } from './chartjs';
export { default as getInitials } from './getInitials';
@@ -1,7 +1,7 @@
import React from 'react';

// Material components
import SvgIcon from '@material-ui/core/SvgIcon';
import { SvgIcon } from '@material-ui/core';

export default function Facebook(props) {
return (
@@ -1,7 +1,7 @@
import React from 'react';

// Material components
import SvgIcon from '@material-ui/core/SvgIcon';
import { SvgIcon } from '@material-ui/core';

export default function Google(props) {
return (
@@ -0,0 +1,2 @@
export { default as Facebook } from './Facebook';
export { default as Google } from './Google';
@@ -5,11 +5,10 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// Material helpers
import { withStyles } from '@material-ui/core/styles';
import { withStyles } from '@material-ui/core';

// Material components
import Divider from '@material-ui/core/Divider';
import Typography from '@material-ui/core/Typography';
import { Divider, Typography } from '@material-ui/core';

// Component styles
const styles = theme => ({
Oops, something went wrong.

0 comments on commit ce22133

Please sign in to comment.
You can’t perform that action at this time.