Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,3 @@ This library is maintained by CodeDead. You can find more about us using the fol
* [Twitter](https://twitter.com/C0DEDEAD)
* [Facebook](https://facebook.com/deadlinecodedead)
* [Reddit](https://reddit.com/r/CodeDead/)

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).
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "deadhash",
"version": "2.0.1",
"description": "Hash calculator",
"version": "2.0.2",
"description": "File and text hash calculator",
"homepage": "./",
"private": true,
"author": {
Expand Down Expand Up @@ -35,19 +35,19 @@
},
"main": "public/electron.js",
"dependencies": {
"@material-ui/core": "^4.9.0",
"@material-ui/icons": "^4.5.1",
"@material-ui/core": "^4.9.9",
"@material-ui/icons": "^4.9.1",
"axios": "^0.19.2",
"cross-env": "^6.0.3",
"crypto-js": "^3.1.9-1",
"electron-is-dev": "^1.1.0",
"react": "^16.12.0",
"cross-env": "^7.0.2",
"crypto-js": "^4.0.0",
"electron-is-dev": "^1.2.0",
"react": "^16.13.1",
"react-contexify": "^4.1.1",
"react-dom": "^16.12.0",
"react-redux": "^7.1.3",
"react-dom": "^16.13.1",
"react-redux": "^7.2.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"react-scripts": "3.3.0",
"react-scripts": "3.4.1",
"redux": "^4.0.5",
"redux-actions": "^2.6.5"
},
Expand Down Expand Up @@ -77,9 +77,9 @@
]
},
"devDependencies": {
"concurrently": "^5.0.2",
"electron": "^7.1.10",
"electron-builder": "^22.2.0",
"wait-on": "^4.0.0"
"concurrently": "^5.1.0",
"electron": "^8.2.0",
"electron-builder": "^22.4.1",
"wait-on": "^4.0.1"
}
}
4 changes: 2 additions & 2 deletions public/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const path = require("path");
const isDev = require("electron-is-dev");
let mainWindow;

function createWindow() {
const createWindow = () => {
mainWindow = new BrowserWindow({
webPreferences: {
nodeIntegration: true
Expand Down Expand Up @@ -34,7 +34,7 @@ function createWindow() {
event.preventDefault();
electron.shell.openExternal(arg);
});
}
};

app.on("ready", createWindow);

Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
content="File and text hash calculator"
/>
<link rel="apple-touch-icon" href="logo192.png" />
<!--
Expand Down
10 changes: 5 additions & 5 deletions src/components/Drawerbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ const Drawerbar = () => {
return (
<Drawer
className={classes.drawer}
variant="persistent"
anchor="left"
open={open}
onClose={handleDrawerClose}
classes={{
paper: classes.drawerPaper,
}}
Expand Down Expand Up @@ -120,7 +120,7 @@ const Drawerbar = () => {

<List>
<ListItem onClick={() => handleIndexChange(4)} button>
<ListItemIcon><HelpIcon color="inherit" /></ListItemIcon>
<ListItemIcon><HelpIcon color="inherit"/></ListItemIcon>
<ListItemText primary={language.help}/>
</ListItem>

Expand All @@ -130,12 +130,12 @@ const Drawerbar = () => {
</ListItem>
</List>

<Divider />
<Divider/>

<List>
<ListItem onClick={() => remote.getGlobal("mainWindow").close()} button>
<ListItemIcon><CloseIcon color="inherit" /></ListItemIcon>
<ListItemText primary={language.exit} />
<ListItemIcon><CloseIcon color="inherit"/></ListItemIcon>
<ListItemText primary={language.exit}/>
</ListItem>
</List>

Expand Down
Loading