diff --git a/package.json b/package.json index 0cd2e654..6f4d8cff 100644 --- a/package.json +++ b/package.json @@ -24,38 +24,38 @@ }, "dependencies": { "electron-is-dev": "0.3.0", - "electron-settings": "3.1.4", + "electron-settings": "3.2.0", "menubar": "5.2.3" }, "devDependencies": { + "@material-ui/core": "1.1.0", + "@material-ui/icons": "1.1.0", "babel-cli": "6.26.0", - "babel-preset-env": "1.6.1", + "babel-preset-env": "1.7.0", "classnames": "2.2.5", "concurrently": "3.5.1", - "cross-env": "5.1.4", + "cross-env": "5.1.6", "del": "3.0.0", - "electron": "1.8.4", - "electron-builder": "20.4.1", + "electron": "2.0.2", + "electron-builder": "20.15.1", "eslint": "4.19.1", "eslint-config-airbnb": "16.1.0", - "eslint-plugin-import": "2.9.0", + "eslint-plugin-import": "2.12.0", "eslint-plugin-jsx-a11y": "6.0.3", - "eslint-plugin-react": "7.7.0", - "esm": "3.0.18", - "fs-extra": "5.0.0", + "eslint-plugin-react": "7.8.2", + "esm": "3.0.38", + "fs-extra": "6.0.1", "glob": "7.1.2", "history": "4.7.2", - "material-ui": "1.0.0-beta.36", - "material-ui-icons": "1.0.0-beta.36", "mousetrap": "1.6.1", "pouchdb-browser": "6.4.3", "prop-types": "15.6.1", - "react": "16.3.2", - "react-dom": "16.3.2", + "react": "16.4.0", + "react-dom": "16.4.0", "react-redux": "5.0.7", "react-router": "3.0.5", "react-router-redux": "4.0.8", - "react-scripts": "1.1.1", + "react-scripts": "1.1.4", "recordrtc": "5.4.6", "redux": "3.7.2", "redux-thunk": "2.2.0", diff --git a/src/components/app.js b/src/components/app.js index 081e7cc4..198a200a 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -2,14 +2,15 @@ import React from 'react'; import PropTypes from 'prop-types'; import { replace, goBack } from 'react-router-redux'; -import { CircularProgress } from 'material-ui/Progress'; -import ActionHome from 'material-ui-icons/Home'; -import ActionSettings from 'material-ui-icons/Settings'; -import BottomNavigation, { BottomNavigationAction } from 'material-ui/BottomNavigation'; -import Button from 'material-ui/Button'; -import Paper from 'material-ui/Paper'; -import Snackbar from 'material-ui/Snackbar'; -import ToggleStar from 'material-ui-icons/Star'; +import CircularProgress from '@material-ui/core/CircularProgress'; +import ActionHome from '@material-ui/icons/Home'; +import ActionSettings from '@material-ui/icons/Settings'; +import BottomNavigation from '@material-ui/core/BottomNavigation'; +import BottomNavigationAction from '@material-ui/core/BottomNavigationAction'; +import Button from '@material-ui/core/Button'; +import Paper from '@material-ui/core/Paper'; +import Snackbar from '@material-ui/core/Snackbar'; +import ToggleStar from '@material-ui/icons/Star'; import connectComponent from '../helpers/connect-component'; diff --git a/src/components/pages/bigger-text.js b/src/components/pages/bigger-text.js index 5bef607c..18f86fbf 100644 --- a/src/components/pages/bigger-text.js +++ b/src/components/pages/bigger-text.js @@ -2,11 +2,11 @@ import React from 'react'; import PropTypes from 'prop-types'; import { goBack } from 'react-router-redux'; -import Typography from 'material-ui/Typography'; -import Button from 'material-ui/Button'; -import CloseIcon from 'material-ui-icons/Close'; -import ZoomInIcon from 'material-ui-icons/ZoomIn'; -import ZoomOutIcon from 'material-ui-icons/ZoomOut'; +import Typography from '@material-ui/core/Typography'; +import Button from '@material-ui/core/Button'; +import CloseIcon from '@material-ui/icons/Close'; +import ZoomInIcon from '@material-ui/icons/ZoomIn'; +import ZoomOutIcon from '@material-ui/icons/ZoomOut'; import connectComponent from '../../helpers/connect-component'; @@ -56,7 +56,6 @@ const BiggerText = (props) => {