Skip to content

Commit 96a6444

Browse files
modularcodermodularcoder
committed
Update dependencies
1 parent 4efb0d8 commit 96a6444

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+34640
-44808
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,54 +15,55 @@
1515
},
1616
"homepage": "http://modular-admin-react.modularcode.io",
1717
"dependencies": {
18-
"@material-ui/core": "4.9.11",
19-
"@material-ui/icons": "4.9.1",
20-
"@material-ui/lab": "^4.0.0-alpha.51",
18+
"@material-ui/core": "^4.11.4",
19+
"@material-ui/icons": "4.11.2",
20+
"@material-ui/lab": "^4.0.0-alpha.58",
2121
"@rehooks/component-size": "^1.0.3",
22-
"@types/lodash": "^4.14.149",
23-
"@types/uuid": "^3.4.6",
24-
"axios": "^0.19.0",
25-
"axios-mock-adapter": "^1.17.0",
26-
"chart.js": "^2.9.3",
27-
"cross-env": "^7.0.0",
28-
"disqus-react": "^1.0.7",
22+
"@types/lodash": "^4.14.168",
23+
"@types/uuid": "^8.3.0",
24+
"axios": "^0.21.1",
25+
"axios-mock-adapter": "^1.19.0",
26+
"chart.js": "^3.2.0",
27+
"cross-env": "^7.0.3",
28+
"disqus-react": "^1.0.11",
2929
"faker": "^5.5.3",
30-
"lodash": "^4.17.15",
31-
"moment": "^2.24.0",
30+
"lodash": "^4.17.21",
31+
"moment": "^2.29.1",
3232
"prop-types": "^15.7.2",
33-
"react": "^16.12.0",
34-
"react-chartjs-2": "^2.9.0",
35-
"react-dom": "^16.11.0",
36-
"react-intl": "^4.4.0",
37-
"react-router-dom": "^5.1.2",
33+
"react": "^16",
34+
"react-chartjs-2": "^3.0.3",
35+
"react-dom": "^16",
36+
"react-intl": "^5.17.1",
37+
"react-router-dom": "^5.2.0",
3838
"react-script": "^2.0.5",
39-
"react-scripts": "3.2.0",
39+
"react-scripts": "^4.0.3",
4040
"store": "^2.0.12",
41-
"storybook-chromatic": "^3.4.1",
42-
"typeface-roboto": "0.0.75",
43-
"typescript": "^3.7.4",
44-
"uuid": "^3.3.3"
41+
"storybook-chromatic": "^4.0.2",
42+
"typeface-roboto": "1.1.13",
43+
"typescript": "^4.2.4",
44+
"uuid": "^8.3.2"
4545
},
4646
"devDependencies": {
47-
"@storybook/addon-a11y": "^5.3.0-rc.4",
48-
"@storybook/addon-actions": "^5.3.0-rc.4",
49-
"@storybook/addon-docs": "^5.3.0-rc.4",
50-
"@storybook/addon-knobs": "^5.3.0-rc.4",
51-
"@storybook/addon-storysource": "^5.3.0-rc.4",
52-
"@storybook/addons": "^5.3.0-rc.4",
53-
"@storybook/preset-create-react-app": "^1.5.0",
54-
"@storybook/preset-typescript": "^1.2.0",
55-
"@storybook/react": "^5.3.0-rc.4",
56-
"@storybook/source-loader": "^5.3.0-rc.4",
57-
"babel-loader": "^8.0.6",
58-
"eslint-plugin-prettier": "^3.1.1",
59-
"fork-ts-checker-webpack-plugin": "^3.1.1",
60-
"gh-pages": "^2.2.0",
61-
"msw": "^0.15.4",
62-
"prettier": "1.18.2",
63-
"react-app-rewired": "^2.1.5",
64-
"react-docgen-typescript-loader": "^3.6.0",
65-
"ts-loader": "^6.2.1"
47+
"@storybook/addon-a11y": "^6.2.9",
48+
"@storybook/addon-actions": "^6.2.9",
49+
"@storybook/addon-docs": "^6.2.9",
50+
"@storybook/addon-knobs": "^6.2.9",
51+
"@storybook/addon-storysource": "^6.2.9",
52+
"@storybook/addons": "^6.2.9",
53+
"@storybook/preset-create-react-app": "^3.1.7",
54+
"@storybook/preset-typescript": "^3.0.0",
55+
"@storybook/react": "^6.2.9",
56+
"@storybook/source-loader": "^6.2.9",
57+
"@types/react-dom": "^17.0.3",
58+
"babel-loader": "^8.1.0",
59+
"eslint-plugin-prettier": "^3.4.0",
60+
"fork-ts-checker-webpack-plugin": "^6.2.5",
61+
"gh-pages": "^3.1.0",
62+
"msw": "^0.28.2",
63+
"prettier": "2.2.1",
64+
"react-app-rewired": "^2.1.8",
65+
"react-docgen-typescript-loader": "^3.7.2",
66+
"ts-loader": "^9.1.1"
6667
},
6768
"eslintConfig": {
6869
"extends": "react-app"

‎src/Administration/Administration.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ const Administration = ({ match }) => {
1010
<Route exact path={`${match.path}/users`} component={UsersList} />
1111
<Route
1212
path={`${match.path}/users/new`}
13-
render={props => <UserEditor {...props} />}
13+
render={(props) => <UserEditor {...props} />}
1414
/>
1515
<Route
1616
path={`${match.path}/users/:userId/edit`}
17-
render={props => (
17+
render={(props) => (
1818
<UserEditor {...props} userId={parseInt(props.match.params.userId)} />
1919
)}
2020
/>

‎src/Administration/Users/UsersEditor/UsersEditor.js

Lines changed: 48 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
FormControl,
1616
InputLabel,
1717
makeStyles,
18-
Grid
18+
Grid,
1919
} from '@material-ui/core'
2020

2121
const UserEditor = (props) => {
@@ -29,11 +29,11 @@ const UserEditor = (props) => {
2929
globalRole: '',
3030
lastName: '',
3131
userToOrganizations: [{}],
32-
username: ''
32+
username: '',
3333
})
3434

3535
useEffect(() => {
36-
if(!userId) {
36+
if (!userId) {
3737
return
3838
}
3939
async function fetchUser() {
@@ -47,20 +47,22 @@ const UserEditor = (props) => {
4747
fetchUser()
4848
}, [userId])
4949

50-
const onChangeHandler = (e) => setUser({
51-
...user,
52-
[e.target.name]: e.target.value
53-
})
50+
const onChangeHandler = (e) =>
51+
setUser({
52+
...user,
53+
[e.target.name]: e.target.value,
54+
})
5455

55-
const setGlobalRole = (e) => setUser({
56-
...user,
57-
globalRole: e.target.value
58-
})
56+
const setGlobalRole = (e) =>
57+
setUser({
58+
...user,
59+
globalRole: e.target.value,
60+
})
5961

6062
const handleSubmit = async (e) => {
61-
e.preventDefault();
63+
e.preventDefault()
6264
try {
63-
if(userId) {
65+
if (userId) {
6466
await api.users.update(userId, user)
6567
} else {
6668
await api.users.create(user)
@@ -77,19 +79,39 @@ const UserEditor = (props) => {
7779
<form onSubmit={handleSubmit}>
7880
<FormControl className={classes.control}>
7981
<InputLabel>First Name</InputLabel>
80-
<Input value={user.firstName} name="firstName" className={classes.width} onChange={e => onChangeHandler(e)}/>
82+
<Input
83+
value={user.firstName}
84+
name="firstName"
85+
className={classes.width}
86+
onChange={(e) => onChangeHandler(e)}
87+
/>
8188
</FormControl>
8289
<FormControl className={classes.control}>
8390
<InputLabel>Last Name</InputLabel>
84-
<Input value={user.lastName} name="lastName" className={classes.width} onChange={e => onChangeHandler(e)}/>
91+
<Input
92+
value={user.lastName}
93+
name="lastName"
94+
className={classes.width}
95+
onChange={(e) => onChangeHandler(e)}
96+
/>
8597
</FormControl>
8698
<FormControl className={classes.control}>
8799
<InputLabel>User Name</InputLabel>
88-
<Input value={user.username} name="username" className={classes.width} onChange={e => onChangeHandler(e)}/>
100+
<Input
101+
value={user.username}
102+
name="username"
103+
className={classes.width}
104+
onChange={(e) => onChangeHandler(e)}
105+
/>
89106
</FormControl>
90107
<FormControl className={classes.control}>
91108
<InputLabel>Email</InputLabel>
92-
<Input value={user.email} name="email" className={classes.width} onChange={e => onChangeHandler(e)}/>
109+
<Input
110+
value={user.email}
111+
name="email"
112+
className={classes.width}
113+
onChange={(e) => onChangeHandler(e)}
114+
/>
93115
</FormControl>
94116
<FormControl className={classes.control}>
95117
<InputLabel>Global Role</InputLabel>
@@ -101,8 +123,8 @@ const UserEditor = (props) => {
101123
className={classes.width}
102124
>
103125
<MenuItem value={user.globalRole}>{user.globalRole}</MenuItem>
104-
<MenuItem value='user'>user</MenuItem>
105-
<MenuItem value='support'>support</MenuItem>
126+
<MenuItem value="user">user</MenuItem>
127+
<MenuItem value="support">support</MenuItem>
106128
</Select>
107129
</FormControl>
108130
<Button
@@ -121,23 +143,23 @@ const UserEditor = (props) => {
121143
}
122144

123145
UserEditor.propTypes = {
124-
userId: PropTypes.number
146+
userId: PropTypes.number,
125147
}
126148

127-
const useStyles = makeStyles(theme => ({
149+
const useStyles = makeStyles((theme) => ({
128150
box: {
129-
padding: 16
151+
padding: 16,
130152
},
131153
control: {
132154
display: 'block',
133-
marginTop: 16
155+
marginTop: 16,
134156
},
135157
margin: {
136-
marginTop: 16
158+
marginTop: 16,
137159
},
138160
width: {
139-
minWidth: 200
140-
}
161+
minWidth: 200,
162+
},
141163
}))
142164

143165
export default UserEditor

‎src/Administration/Users/UsersList/UsersList.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ const UsersList = ({ match }) => {
109109
setPage(newPage)
110110
}
111111

112-
const handleChangeRowsPerPage = event => {
112+
const handleChangeRowsPerPage = (event) => {
113113
setRowsPerPage(parseInt(event.target.value, 10))
114114
setPage(0)
115115
}
@@ -142,14 +142,14 @@ const UsersList = ({ match }) => {
142142
<Table className={classes.table} aria-label="custom pagination table">
143143
<TableHead>
144144
<TableRow>
145-
{tableColumns.map(column => (
145+
{tableColumns.map((column) => (
146146
<TableCell key={column.id}>
147147
{/* Sortable */}
148148
{column.isSortable && (
149149
<TableSortLabel
150150
active={order.orderBy === column.id}
151151
direction={order.orderBy === column.id ? order.order : 'asc'}
152-
onClick={event => handelChangeOrder(event, column.id)}
152+
onClick={(event) => handelChangeOrder(event, column.id)}
153153
>
154154
{column.label}
155155
</TableSortLabel>
@@ -188,7 +188,7 @@ const UsersList = ({ match }) => {
188188
)
189189
}
190190

191-
const useStyles = makeStyles(theme => ({
191+
const useStyles = makeStyles((theme) => ({
192192
root: {
193193
flexShrink: 0,
194194
marginLeft: theme.spacing(2.5),

‎src/Administration/Users/UsersList/UsersListActions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import clsx from 'clsx'
2-
import React, { useContext, useState } from 'react'
2+
import React, { useState } from 'react'
33

44
import { fade, makeStyles, Button, Tooltip, InputBase } from '@material-ui/core'
55

@@ -19,7 +19,7 @@ const DashboardActions = () => {
1919
const [search, setSearch] = useState('')
2020
// const { filter } = useContext(usersListContext)
2121

22-
const handleChangeSearchInput = event => {
22+
const handleChangeSearchInput = (event) => {
2323
setSearch(event.target.value)
2424
}
2525

@@ -73,7 +73,7 @@ const DashboardActions = () => {
7373
)
7474
}
7575

76-
const useStyles = makeStyles(theme => ({
76+
const useStyles = makeStyles((theme) => ({
7777
root: {
7878
// color: theme.palette.primary.main,
7979
color: theme.palette.grey[600],

‎src/Administration/Users/UsersList/UsersListTableItems.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const UsersListTableItems = ({ users, rowsPerPage = 10, rowsExpected = 10 }) =>
1919
return (
2020
<>
2121
{!users.length &&
22-
usersArrayExpected.map(item => (
22+
usersArrayExpected.map((item) => (
2323
<TableRow key={item}>
2424
<TableCell>
2525
<Skeleton variant="circle" width={40} height={40} />
@@ -44,7 +44,7 @@ const UsersListTableItems = ({ users, rowsPerPage = 10, rowsExpected = 10 }) =>
4444
</TableCell>
4545
</TableRow>
4646
))}
47-
{users.map(row => (
47+
{users.map((row) => (
4848
<TableRow key={row.id}>
4949
<TableCell>
5050
<Avatar alt={row.firstName} src={row.avatarUrl} />
@@ -90,7 +90,7 @@ const UsersListTableItems = ({ users, rowsPerPage = 10, rowsExpected = 10 }) =>
9090

9191
UsersListTableItems.propTypes = {}
9292

93-
const useStyles = makeStyles(theme => ({
93+
const useStyles = makeStyles((theme) => ({
9494
link: {
9595
color: 'inherit',
9696
},

‎src/AppRouter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const AppRouter = () => (
3232
const RouteWithLayout = ({ component: Component, layout: Layout, ...rest }) => (
3333
<Route
3434
{...rest}
35-
render={props => {
35+
render={(props) => {
3636
if (Layout) {
3737
return (
3838
<Layout>

‎src/Auth/Auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default function Auth({ match }) {
4242
)
4343
}
4444

45-
const useStyles = makeStyles(theme => ({
45+
const useStyles = makeStyles((theme) => ({
4646
container: {
4747
minHeight: '100vh',
4848
},

‎src/Auth/Login/Login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default function Login() {
7272
)
7373
}
7474

75-
const useStyles = makeStyles(theme => ({
75+
const useStyles = makeStyles((theme) => ({
7676
form: {
7777
width: '100%', // Fix IE 11 issue.
7878
marginTop: theme.spacing(1),

‎src/Auth/Recover/Recover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default function Login() {
4949
)
5050
}
5151

52-
const useStyles = makeStyles(theme => ({
52+
const useStyles = makeStyles((theme) => ({
5353
form: {
5454
width: '100%', // Fix IE 11 issue.
5555
marginTop: theme.spacing(1),

‎src/Auth/Reset/Reset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default function Login() {
5858
)
5959
}
6060

61-
const useStyles = makeStyles(theme => ({
61+
const useStyles = makeStyles((theme) => ({
6262
form: {
6363
width: '100%', // Fix IE 11 issue.
6464
marginTop: theme.spacing(1),

‎src/Auth/Signup/Signup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export default function SignUp() {
107107
)
108108
}
109109

110-
const useStyles = makeStyles(theme => ({
110+
const useStyles = makeStyles((theme) => ({
111111
form: {
112112
width: '100%', // Fix IE 11 issue.
113113
marginTop: theme.spacing(3),

0 commit comments

Comments
 (0)