Skip to content

Commit 7992da8

Browse files
authored
Merge pull request #19 from CodeDead/release/2.0.2
Release/2.0.2
2 parents 730377c + dfcc347 commit 7992da8

File tree

6 files changed

+1785
-1827
lines changed

6 files changed

+1785
-1827
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,3 @@ This library is maintained by CodeDead. You can find more about us using the fol
2626
* [Twitter](https://twitter.com/C0DEDEAD)
2727
* [Facebook](https://facebook.com/deadlinecodedead)
2828
* [Reddit](https://reddit.com/r/CodeDead/)
29-
30-
We would also like to thank JetBrains for the open source license that they granted us to work with wonderful tools such as [WebStorm](https://jetbrains.com/webstorm) and [Resharper](https://jetbrains.com/resharper).

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "deadhash",
3-
"version": "2.0.1",
4-
"description": "Hash calculator",
3+
"version": "2.0.2",
4+
"description": "File and text hash calculator",
55
"homepage": "./",
66
"private": true,
77
"author": {
@@ -35,19 +35,19 @@
3535
},
3636
"main": "public/electron.js",
3737
"dependencies": {
38-
"@material-ui/core": "^4.9.0",
39-
"@material-ui/icons": "^4.5.1",
38+
"@material-ui/core": "^4.9.9",
39+
"@material-ui/icons": "^4.9.1",
4040
"axios": "^0.19.2",
41-
"cross-env": "^6.0.3",
42-
"crypto-js": "^3.1.9-1",
43-
"electron-is-dev": "^1.1.0",
44-
"react": "^16.12.0",
41+
"cross-env": "^7.0.2",
42+
"crypto-js": "^4.0.0",
43+
"electron-is-dev": "^1.2.0",
44+
"react": "^16.13.1",
4545
"react-contexify": "^4.1.1",
46-
"react-dom": "^16.12.0",
47-
"react-redux": "^7.1.3",
46+
"react-dom": "^16.13.1",
47+
"react-redux": "^7.2.0",
4848
"react-router": "^5.1.2",
4949
"react-router-dom": "^5.1.2",
50-
"react-scripts": "3.3.0",
50+
"react-scripts": "3.4.1",
5151
"redux": "^4.0.5",
5252
"redux-actions": "^2.6.5"
5353
},
@@ -77,9 +77,9 @@
7777
]
7878
},
7979
"devDependencies": {
80-
"concurrently": "^5.0.2",
81-
"electron": "^7.1.10",
82-
"electron-builder": "^22.2.0",
83-
"wait-on": "^4.0.0"
80+
"concurrently": "^5.1.0",
81+
"electron": "^8.2.0",
82+
"electron-builder": "^22.4.1",
83+
"wait-on": "^4.0.1"
8484
}
8585
}

public/electron.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const path = require("path");
55
const isDev = require("electron-is-dev");
66
let mainWindow;
77

8-
function createWindow() {
8+
const createWindow = () => {
99
mainWindow = new BrowserWindow({
1010
webPreferences: {
1111
nodeIntegration: true
@@ -34,7 +34,7 @@ function createWindow() {
3434
event.preventDefault();
3535
electron.shell.openExternal(arg);
3636
});
37-
}
37+
};
3838

3939
app.on("ready", createWindow);
4040

public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="theme-color" content="#000000" />
88
<meta
99
name="description"
10-
content="Web site created using create-react-app"
10+
content="File and text hash calculator"
1111
/>
1212
<link rel="apple-touch-icon" href="logo192.png" />
1313
<!--

src/components/Drawerbar/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ const Drawerbar = () => {
9090
return (
9191
<Drawer
9292
className={classes.drawer}
93-
variant="persistent"
9493
anchor="left"
9594
open={open}
95+
onClose={handleDrawerClose}
9696
classes={{
9797
paper: classes.drawerPaper,
9898
}}
@@ -120,7 +120,7 @@ const Drawerbar = () => {
120120

121121
<List>
122122
<ListItem onClick={() => handleIndexChange(4)} button>
123-
<ListItemIcon><HelpIcon color="inherit" /></ListItemIcon>
123+
<ListItemIcon><HelpIcon color="inherit"/></ListItemIcon>
124124
<ListItemText primary={language.help}/>
125125
</ListItem>
126126

@@ -130,12 +130,12 @@ const Drawerbar = () => {
130130
</ListItem>
131131
</List>
132132

133-
<Divider />
133+
<Divider/>
134134

135135
<List>
136136
<ListItem onClick={() => remote.getGlobal("mainWindow").close()} button>
137-
<ListItemIcon><CloseIcon color="inherit" /></ListItemIcon>
138-
<ListItemText primary={language.exit} />
137+
<ListItemIcon><CloseIcon color="inherit"/></ListItemIcon>
138+
<ListItemText primary={language.exit}/>
139139
</ListItem>
140140
</List>
141141

0 commit comments

Comments
 (0)