Merge pull request #2 from forrestjs/#1

Update MUI
forrestjs · Oct 13, 2021 · 64b13f6 · 64b13f6
2 parents dfae7bb + ee5aa16
commit 64b13f6
Show file tree

Hide file tree

Showing 27 changed files with 4,082 additions and 141,056 deletions.
diff --git a/kitchensink/package-lock.json b/kitchensink/package-lock.json
diff --git a/kitchensink/package.json b/kitchensink/package.json
@@ -5,11 +5,14 @@
     "README.md"
   ],
   "dependencies": {
-    "@forrestjs/hooks": "4.0.0-alpha.12",
-    "@forrestjs/react-mui": "0.0.1-alpha.9",
-    "@forrestjs/react-root": "0.0.1-alpha.9",
-    "@forrestjs/react-router": "0.0.1-alpha.9",
-    "axios": "^0.21.1"
+    "@forrestjs/hooks": "4.0.0-alpha.18",
+    "@forrestjs/react-root": "0.0.1-alpha.15",
+    "@forrestjs/react-router": "0.0.1-alpha.15",
+    "@forrestjs/react-mui": "0.0.1-alpha.15",
+    "axios": "^0.23.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-scripts": "4.0.3"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/kitchensink/src/components/ButtonLink/ButtonLink.js b/kitchensink/src/components/ButtonLink/ButtonLink.js
@@ -1,4 +1,4 @@
-import Button from '@material-ui/core/Button';
+import Button from '@mui/material/Button';
 import { Link } from 'react-router-dom';
 
 export const ButtonLink = (props) => <Button component={Link} {...props} />;
diff --git a/kitchensink/src/components/ListItemLink/ListItemLink.js b/kitchensink/src/components/ListItemLink/ListItemLink.js
@@ -1,4 +1,4 @@
-import ListItem from '@material-ui/core/ListItem';
+import ListItem from '@mui/material/ListItem';
 import { Link } from 'react-router-dom';
 
 export const ListItemLink = (props) => (

diff --git a/kitchensink/src/components/PageContent/PageContent.js b/kitchensink/src/components/PageContent/PageContent.js
@@ -1,8 +1,8 @@
 import React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles/';
 
-import Container from '@material-ui/core/Container';
-import Grid from '@material-ui/core/Grid';
+import Container from '@mui/material/Container';
+import Grid from '@mui/material/Grid';
 
 const useStyles = makeStyles((theme) => ({
   content: {

diff --git a/kitchensink/src/components/PageItem/PageItem.js b/kitchensink/src/components/PageItem/PageItem.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import clsx from 'clsx';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles/';
 
-import Grid from '@material-ui/core/Grid';
-import Paper from '@material-ui/core/Paper';
+import Grid from '@mui/material/Grid';
+import Paper from '@mui/material/Paper';
 
 import PageItemTitle from './PageItemTitle';
 

diff --git a/kitchensink/src/components/PageItem/PageItemTitle.js b/kitchensink/src/components/PageItem/PageItemTitle.js
@@ -1,8 +1,8 @@
 import React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles/';
 
-import Toolbar from '@material-ui/core/Toolbar';
-import Typography from '@material-ui/core/Typography';
+import Toolbar from '@mui/material/Toolbar';
+import Typography from '@mui/material/Typography';
 
 const useStyles = makeStyles((theme) => ({
   toolbar: {

diff --git a/kitchensink/src/features/dashboard/DashboardMenuItems.js b/kitchensink/src/features/dashboard/DashboardMenuItems.js
@@ -1,6 +1,6 @@
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import ListItemText from '@material-ui/core/ListItemText';
-import AppsIcon from '@material-ui/icons/Apps';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import AppsIcon from '@mui/icons-material/Apps';
 import ListItemLink from '../../components/ListItemLink';
 
 export const DashboardMenuItems = () => (

diff --git a/kitchensink/src/features/invoices/InvoicesMenuItems.js b/kitchensink/src/features/invoices/InvoicesMenuItems.js
@@ -1,6 +1,6 @@
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import ListItemText from '@material-ui/core/ListItemText';
-import ReceiptIcon from '@material-ui/icons/Receipt';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import ReceiptIcon from '@mui/icons-material/Receipt';
 import ListItemLink from '../../components/ListItemLink';
 
 export const InvoicesMenuItems = () => (

diff --git a/kitchensink/src/features/layout/Layout.js b/kitchensink/src/features/layout/Layout.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import CssBaseline from '@material-ui/core/CssBaseline';
+import { makeStyles } from '@mui/styles';
+import CssBaseline from '@mui/material/CssBaseline';
 
 import { useGetContext, useGetConfig } from '@forrestjs/react-root';
 import { LayoutDrawer } from './LayoutDrawer';

diff --git a/kitchensink/src/features/layout/LayoutAppBar.js b/kitchensink/src/features/layout/LayoutAppBar.js
@@ -1,15 +1,15 @@
 import React from 'react';
 import clsx from 'clsx';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 
-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 Badge from '@material-ui/core/Badge';
+import AppBar from '@mui/material/AppBar';
+import Toolbar from '@mui/material/Toolbar';
+import IconButton from '@mui/material/IconButton';
+import Typography from '@mui/material/Typography';
+// import Badge from '@mui/material/Badge';
 
-import MenuIcon from '@material-ui/icons/Menu';
-// import NotificationsIcon from '@material-ui/icons/Notifications';
+import MenuIcon from '@mui/icons-material/Menu';
+// import NotificationsIcon from '@mui/icons-material/Notifications';
 
 // import { useGetContext, useGetConfig } from '../../services/react-root';
 // import { LayoutDrawer } from './LayoutDrawer';

diff --git a/kitchensink/src/features/layout/LayoutDrawer.js b/kitchensink/src/features/layout/LayoutDrawer.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import clsx from 'clsx';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 
-import Drawer from '@material-ui/core/Drawer';
-import Divider from '@material-ui/core/Divider';
-import IconButton from '@material-ui/core/IconButton';
-import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
+import Drawer from '@mui/material/Drawer';
+import Divider from '@mui/material/Divider';
+import IconButton from '@mui/material/IconButton';
+import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
 
 import { LayoutDrawerList } from './LayoutDrawerList';
 

diff --git a/kitchensink/src/features/layout/LayoutDrawerList.js b/kitchensink/src/features/layout/LayoutDrawerList.js
@@ -1,5 +1,5 @@
-import List from '@material-ui/core/List';
-import Divider from '@material-ui/core/Divider';
+import List from '@mui/material/List';
+import Divider from '@mui/material/Divider';
 
 export const LayoutDrawerList = ({ items }) => (
   <>

diff --git a/kitchensink/src/features/mui-theme/index.js b/kitchensink/src/features/mui-theme/index.js
@@ -1,4 +1,4 @@
-import { blueGrey } from '@material-ui/core/colors';
+import { blueGrey } from '@mui/material/colors';
 
 export const muiTheme = ({ registerAction }) => {
   registerAction({

diff --git a/kitchensink/src/features/users/components/UsersMenuItems.js b/kitchensink/src/features/users/components/UsersMenuItems.js
@@ -1,6 +1,6 @@
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import ListItemText from '@material-ui/core/ListItemText';
-import PeopleIcon from '@material-ui/icons/People';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import PeopleIcon from '@mui/icons-material/People';
 import ListItemLink from '../../../components/ListItemLink';
 
 export const UsersMenuItems = () => (

diff --git a/kitchensink/src/features/users/containers/UserDetails.js b/kitchensink/src/features/users/containers/UserDetails.js
@@ -1,6 +1,6 @@
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
 
 import PageContent from '../../../components/PageContent';
 import PageItem from '../../../components/PageItem';

diff --git a/kitchensink/src/features/users/containers/UsersList.js b/kitchensink/src/features/users/containers/UsersList.js
@@ -1,5 +1,5 @@
-import List from '@material-ui/core/List';
-import ListItemText from '@material-ui/core/ListItemText';
+import List from '@mui/material/List';
+import ListItemText from '@mui/material/ListItemText';
 
 import ListItemLink from '../../../components/ListItemLink';
 import PageContent from '../../../components/PageContent';

diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.0.1-alpha.9"
+  "version": "0.0.1-alpha.15"
 }