Fix components

forrestjs · Oct 13, 2021 · ee5aa16 · ee5aa16
1 parent 59a23bd
commit ee5aa16
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 54 deletions.
diff --git a/kitchensink/package-lock.json b/kitchensink/package-lock.json
diff --git a/kitchensink/package.json b/kitchensink/package.json
@@ -6,9 +6,9 @@
   ],
   "dependencies": {
     "@forrestjs/hooks": "4.0.0-alpha.18",
-    "@forrestjs/react-root": "0.0.1-alpha.14",
-    "@forrestjs/react-router": "0.0.1-alpha.14",
-    "@forrestjs/react-mui": "0.0.1-alpha.14",
+    "@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",

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/index.js b/kitchensink/src/index.js
@@ -9,16 +9,12 @@ import reactAxios from './react-axios';
 // Features
 import { muiTheme } from './features/mui-theme';
 import { layout } from './features/layout';
-// import { dashboard } from './features/dashboard';
-// import { users } from './features/users';
-// import { invoices } from './features/invoices';
+import { dashboard } from './features/dashboard';
+import { users } from './features/users';
+import { invoices } from './features/invoices';
 
 runHookApp({
   trace: 'compact',
   services: [reactRoot, reactMUI, reactRouter, reactAxios],
-  features: [
-    muiTheme,
-    layout,
-    // dashboard, users, invoices
-  ],
+  features: [muiTheme, layout, dashboard, users, invoices],
 }).catch((err) => console.error(`Boot: ${err.message}`));
diff --git a/kitchensink/src/react-mui/hooks.js b/kitchensink/src/react-mui/hooks.js
diff --git a/kitchensink/src/react-mui/index.js b/kitchensink/src/react-mui/index.js