Skip to content

Commit 7128194

Browse files
jhhjhh
authored
Merge pull request #14 from strykeforce/web-deps
Update web app dependencies
2 parents b3b47f8 + f4d41a8 commit 7128194

File tree

13 files changed

+3908
-3939
lines changed

13 files changed

+3908
-3939
lines changed

‎admin-web/package-lock.json‎

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

‎admin-web/package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
"private": true,
55
"proxy": "http://localhost:5000",
66
"dependencies": {
7-
"@material-ui/core": "^4.9.1",
7+
"@material-ui/core": "^4.11.0",
88
"@material-ui/icons": "^4.9.1",
9-
"@types/jest": "^25.1.1",
10-
"@types/node": "^13.7.0",
11-
"@types/react": "^16.9.19",
12-
"@types/react-dom": "^16.9.5",
13-
"@types/socket.io-client": "^1.4.32",
14-
"lodash": "^4.17.11",
15-
"react": "^16.12.0",
16-
"react-dom": "^16.12.0",
17-
"react-scripts": "^3.3.1",
9+
"@types/jest": "^26.0.4",
10+
"@types/node": "^14.0.22",
11+
"@types/react": "^16.9.42",
12+
"@types/react-dom": "^16.9.8",
13+
"@types/socket.io-client": "^1.4.33",
14+
"lodash": "^4.17.19",
15+
"react": "^16.13.1",
16+
"react-dom": "^16.13.1",
17+
"react-scripts": "^3.4.1",
1818
"socket.io-client": "^2.3.0",
1919
"typeface-roboto": "0.0.75",
20-
"typescript": "^3.7.5"
20+
"typescript": "^3.9.6"
2121
},
2222
"scripts": {
2323
"start": "react-scripts start",
@@ -43,13 +43,13 @@
4343
]
4444
},
4545
"devDependencies": {
46-
"@typescript-eslint/eslint-plugin": "^2.19.0",
47-
"@typescript-eslint/parser": "^2.19.0",
48-
"eslint-config-prettier": "^6.10.0",
49-
"eslint-plugin-prettier": "^3.1.2",
50-
"eslint-plugin-react": "^7.18.3",
51-
"eslint-plugin-react-hooks": "^2.3.0",
52-
"npm-check": "^5.9.0",
53-
"prettier": "^1.19.1"
46+
"@typescript-eslint/eslint-plugin": "^3.6.0",
47+
"@typescript-eslint/parser": "^3.6.0",
48+
"eslint-config-prettier": "^6.11.0",
49+
"eslint-plugin-prettier": "^3.1.4",
50+
"eslint-plugin-react": "^7.20.3",
51+
"eslint-plugin-react-hooks": "^4.0.7",
52+
"npm-check": "^5.9.2",
53+
"prettier": "^2.0.5"
5454
}
5555
}

‎admin-web/src/camera-capture.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const CameraCapture = ({ camera }: Props): JSX.Element => {
7474

7575
export default CameraCapture;
7676

77-
const useStyles = makeStyles(theme => ({
77+
const useStyles = makeStyles((theme) => ({
7878
root: {
7979
padding: theme.spacing(2),
8080
display: 'flex',

‎admin-web/src/camera-control.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const CameraControl = ({ camera }: Props): JSX.Element => {
5252

5353
export default CameraControl;
5454

55-
const useStyles = makeStyles(theme => ({
55+
const useStyles = makeStyles((theme) => ({
5656
root: {
5757
padding: theme.spacing(2),
5858
display: 'flex',

‎admin-web/src/camera-filter.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const CameraFilter = ({ camera }: Props): JSX.Element => {
6262

6363
export default CameraFilter;
6464

65-
const useStyles = makeStyles(theme => ({
65+
const useStyles = makeStyles((theme) => ({
6666
root: {
6767
padding: theme.spacing(2),
6868
display: 'flex',

‎admin-web/src/camera-list.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ const CameraList = (props: Props): JSX.Element => {
2222

2323
return (
2424
<List>
25-
{Object.values(units).map(unit => (
25+
{Object.values(units).map((unit) => (
2626
<div key={unit.id}>
2727
<ListItem button selected={selectedId === unit.id} onClick={() => onClick(unit.id)}>
2828
<ListItemIcon>
2929
<DeadeyeIcon />
3030
</ListItemIcon>
3131
<ListItemText primary={`Unit ${unit.id}`} />
3232
</ListItem>
33-
{Object.values(unit.cameras).map(camera => (
33+
{Object.values(unit.cameras).map((camera) => (
3434
<ListItem
3535
button
3636
className={classes.camera}

‎admin-web/src/camera-panel.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const CameraPanel = (props: Props): JSX.Element => {
6666

6767
export default CameraPanel;
6868

69-
const useStyles = makeStyles(theme => ({
69+
const useStyles = makeStyles((theme) => ({
7070
root: {
7171
flexGrow: 1,
7272
backgroundColor: theme.palette.background.paper,

‎admin-web/src/camera-pipeline.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const CameraPipeline = ({ camera }: Props): JSX.Element => {
4545

4646
export default CameraPipeline;
4747

48-
const useStyles = makeStyles(theme => ({
48+
const useStyles = makeStyles((theme) => ({
4949
root: {
5050
padding: theme.spacing(2),
5151
display: 'flex',

‎admin-web/src/camera-stream.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const CameraStream = (props: Props): JSX.Element => {
6262

6363
export default CameraStream;
6464

65-
const useStyles = makeStyles(theme => ({
65+
const useStyles = makeStyles((theme) => ({
6666
root: {
6767
padding: theme.spacing(2),
6868
maxWidth: 365,

‎admin-web/src/dashboard.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const Dashboard = (props: Props): JSX.Element => {
7070
</IconButton>
7171
</div>
7272
<Divider />
73-
<CameraList units={units} selectedId={selectedId} onClick={id => setSelectedId(id)} />
73+
<CameraList units={units} selectedId={selectedId} onClick={(id) => setSelectedId(id)} />
7474
</Drawer>
7575
<main className={classes.content}>
7676
<div className={classes.appBarSpacer} />
@@ -96,7 +96,7 @@ const MadeWithLove = (): JSX.Element => {
9696

9797
const drawerWidth = 240;
9898

99-
const useStyles = makeStyles(theme => ({
99+
const useStyles = makeStyles((theme) => ({
100100
root: {
101101
display: 'flex',
102102
},

0 commit comments

Comments
 (0)