Merge pull request #38 from CodeDead/release/2.1.1

Release/2.1.1

Author: CodeDead

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "env": {
     "browser": true,
-    "es2020": true,
+    "es2021": true,
     "node": true
   },
   "extends": [
@@ -12,7 +12,7 @@
     "ecmaFeatures": {
       "jsx": true
     },
-    "ecmaVersion": 11,
+    "ecmaVersion": 12,
     "sourceType": "module"
   },
   "plugins": [

README.md

@@ -4,9 +4,9 @@
 
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/CodeDead/DeadHash-js)
 ![GitHub](https://img.shields.io/github/license/CodeDead/DeadHash-Js)
-![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/2.1.0/total)
+![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/2.1.1/total)
 
-DeadHash is a free and open-source utility to calculate file and text hashes. The following hash calculations are supported:
+DeadHash is a free and open-source utility to calculate file and text hashes and checksums. The following calculations are supported:
 
 * MD4
 * MD5
@@ -16,9 +16,28 @@ DeadHash is a free and open-source utility to calculate file and text hashes. Th
 * SHA-384
 * SHA-512
 * RIPEMD-160
+* CRC32
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app) and built using [Electron](https://electronjs.org/).
 
+## Building
+
+In order to produce binary distributable files or to start a development build, you must first issue the following command,
+in order to ensure that the React build is up-to-date:
+```
+yarn react-build
+```
+
+After running `yarn react-build`, you can issue the following command in order to produce the binary distributable files:
+```
+yarn build
+```
+
+If you want to start the development version, you can issue the following command, after running `yarn react-build`:
+```
+yarn start
+```
+
 ## Learn More
 
 You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deadhash",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "File and text hash calculator",
   "homepage": "./",
   "private": true,
@@ -37,14 +37,15 @@
   "dependencies": {
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.11.2",
+    "crc": "^3.8.0",
     "cross-env": "^7.0.3",
     "electron-is-dev": "^1.2.0",
     "react": "^17.0.1",
     "react-contexify": "^5.0.0",
     "react-dom": "^17.0.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^4.0.1"
+    "react-scripts": "^4.0.2"
   },
   "scripts": {
     "react-start": "react-scripts start",
@@ -70,8 +71,9 @@
   },
   "devDependencies": {
     "concurrently": "^5.3.0",
-    "electron": "^11.2.1",
+    "electron": "^11.2.2",
     "electron-builder": "^22.9.1",
+    "eslint": "^7.19.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",

public/workers/FileWorker/index.html

@@ -9,8 +9,9 @@
   const ipcRenderer = window.require('electron').ipcRenderer;
   const fs = window.require('fs');
   const crypto = window.require('crypto');
+  const crc32Calculator = require('crc').crc32;
 
-  const fileHash = (filePath, md4, md5, sha1, sha224, sha256, sha384, sha512, ripemd160) => {
+  const fileHash = (filePath, md4, md5, sha1, sha224, sha256, sha384, sha512, ripemd160, crc32) => {
     return new Promise((resolve, reject) => {
       let MD4,
         MD5,
@@ -19,7 +20,8 @@
         SHA256,
         SHA384,
         SHA512,
-        RIPEMD160;
+        RIPEMD160,
+      crc32Checksum;
 
       if (md4) MD4 = crypto.createHash('md4');
       if (md5) MD5 = crypto.createHash('md5');
@@ -30,6 +32,7 @@
       if (sha512) SHA512 = crypto.createHash('sha512');
       if (ripemd160) RIPEMD160 = crypto.createHash('ripemd160');
 
+
       try {
         const s = fs.createReadStream(filePath.toString());
 
@@ -42,6 +45,7 @@
           if (sha384) SHA384.update(data);
           if (sha512) SHA512.update(data);
           if (ripemd160) RIPEMD160.update(data);
+          if (crc32) crc32Checksum = crc32Calculator(data, crc32Checksum);
         });
 
         s.on('end', () => {
@@ -103,6 +107,12 @@
                 .toString()
             });
           }
+          if (crc32) {
+            newHashes.push({
+              type: 'CRC32',
+              hash: crc32Checksum.toString(16),
+            });
+          }
 
           if (newHashes.length === 0) newHashes = null;
 
@@ -120,7 +130,7 @@
   }
 
   ipcRenderer.on("calculate-file-hash", (e, data) => {
-    fileHash(data.filePath, data.md4, data.md5, data.sha1, data.sha224, data.sha256, data.sha384, data.sha512, data.ripemd160)
+    fileHash(data.filePath, data.md4, data.md5, data.sha1, data.sha224, data.sha256, data.sha384, data.sha512, data.ripemd160, data.crc32)
       .then(data => {
         ipcRenderer.send("file-hash-calculated", data);
       })

public/workers/TextWorker/index.html

@@ -9,7 +9,7 @@
   const ipcRenderer = window.require('electron').ipcRenderer;
   const crypto = window.require('crypto');
 
-  const textHash = (text, md4, md5, sha1, sha224, sha256, sha384, sha512, ripemd160) => {
+  const textHash = (text, md4, md5, sha1, sha224, sha256, sha384, sha512, ripemd160, crc32) => {
     return new Promise((resolve, reject) => {
       let newHashes = [];
       try {
@@ -85,6 +85,13 @@
               .toString()
           });
         }
+        if (crc32) {
+          const { crc32 } = require('crc');
+          newHashes.push({
+            type: 'CRC32',
+            hash: crc32(text).toString(16),
+          });
+        }
 
         if (newHashes.length === 0) newHashes = null;
 
@@ -96,7 +103,7 @@
   };
 
   ipcRenderer.on('calculate-text-hash', (e, data) => {
-    textHash(data.text, data.md4, data.md5, data.sha1, data.sha224, data.sha256, data.sha384, data.sha512, data.ripemd160)
+    textHash(data.text, data.md4, data.md5, data.sha1, data.sha224, data.sha256, data.sha384, data.sha512, data.ripemd160, data.crc32)
       .then(data => {
         ipcRenderer.send('text-hash-calculated', data);
       })

src/components/App/index.jsx

@@ -5,7 +5,7 @@ import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
 import Home from '../../routes/Home';
 import Settings from '../../routes/Settings';
 import ThemeSelector from '../../utils/ThemeSelector';
-import Topbar from '../Topbar';
+import TopBar from '../TopBar';
 import About from '../../routes/About';
 import File from '../../routes/File';
 import Text from '../../routes/Text';
@@ -71,7 +71,7 @@ const App = () => {
     <ThemeProvider theme={theme}>
       <BrowserRouter>
         <DropZone enabled={enabled} onDrop={onDrop} reRoute="/file">
-          <Topbar />
+          <TopBar />
           <CssBaseline />
           <Switch>
             <Route path="/settings">

src/components/Drawerbar/index.jsx renamed to src/components/DrawerBar/index.jsx

@@ -37,7 +37,7 @@ const useStyles = makeStyles((theme) => ({
 
 const { ipcRenderer } = window.require('electron');
 
-const Drawerbar = ({ open, onClose }) => {
+const DrawerBar = ({ open, onClose }) => {
   const [state] = useContext(MainContext);
   const language = state.languages[state.languageIndex];
   const selectedItem = state.selectedListItem;
@@ -145,4 +145,4 @@ const Drawerbar = ({ open, onClose }) => {
   );
 };
 
-export default Drawerbar;
+export default DrawerBar;

src/components/Topbar/index.jsx renamed to src/components/TopBar/index.jsx

@@ -9,11 +9,13 @@ import MenuIcon from '@material-ui/icons/Menu';
 import Menu from '@material-ui/core/Menu';
 import MenuItem from '@material-ui/core/MenuItem';
 import CloseIcon from '@material-ui/icons/Close';
+import Brightness5Icon from '@material-ui/icons/Brightness5';
+import Brightness7Icon from '@material-ui/icons/Brightness7';
 import MinimizeIcon from '@material-ui/icons/Minimize';
 import FullScreenIcon from '@material-ui/icons/Fullscreen';
 import FullscreenExitIcon from '@material-ui/icons/FullscreenExit';
-import Drawerbar from '../Drawerbar';
-import { setLanguageIndex } from '../../reducers/MainReducer/Actions';
+import DrawerBar from '../DrawerBar';
+import { setLanguageIndex, setThemeStyle } from '../../reducers/MainReducer/Actions';
 import { MainContext } from '../../contexts/MainContextProvider';
 
 const drawerWidth = 220;
@@ -45,11 +47,16 @@ const useStyles = makeStyles((theme) => ({
 
 const { ipcRenderer } = window.require('electron');
 
-const Topbar = () => {
+const TopBar = () => {
   const [state, d1] = useContext(MainContext);
 
   const {
-    languageIndex, minimizeEnabled, maximizeEnabled, languageEnabled,
+    languageIndex,
+    minimizeEnabled,
+    maximizeEnabled,
+    languageEnabled,
+    themeStyle,
+    themeToggleEnabled,
   } = state;
   const language = state.languages[languageIndex];
 
@@ -124,6 +131,13 @@ const Topbar = () => {
     ipcRenderer.send('handle-maximize');
   };
 
+  /**
+   * Change the theme style
+   */
+  const changeThemeStyle = () => {
+    d1(setThemeStyle(themeStyle === 'dark' ? 'light' : 'dark'));
+  };
+
   return (
     <div className={classes.root}>
       <AppBar
@@ -145,6 +159,12 @@ const Topbar = () => {
             {language.appName}
           </Typography>
 
+          {themeToggleEnabled ? (
+            <IconButton color="inherit" onClick={changeThemeStyle}>
+              {themeStyle === 'dark' ? <Brightness5Icon /> : <Brightness7Icon />}
+            </IconButton>
+          ) : null}
+
           {languageEnabled
             ? (
               <div>
@@ -264,10 +284,10 @@ const Topbar = () => {
           </IconButton>
         </Toolbar>
       </AppBar>
-      <Drawerbar open={drawerOpen} onClose={() => setDrawerOpen(false)} />
+      <DrawerBar open={drawerOpen} onClose={() => setDrawerOpen(false)} />
       <Toolbar />
     </div>
   );
 };
 
-export default Topbar;
+export default TopBar;

src/contexts/CryptoContextReducer/index.jsx

@@ -9,6 +9,7 @@ const sha256 = localStorage.sha256 && localStorage.sha256 === 'true' ? true : !l
 const sha384 = localStorage.sha384 && localStorage.sha384 === 'true' ? true : !localStorage.sha384;
 const sha512 = localStorage.sha512 && localStorage.sha512 === 'true' ? true : !localStorage.sha512;
 const ripemd160 = localStorage.ripemd160 && localStorage.ripemd160 === 'true' ? true : !localStorage.ripemd160;
+const crc32 = localStorage.crc32 && localStorage.crc32 === 'true' ? true : !localStorage.crc32;
 
 const initState = {
   md4,
@@ -19,6 +20,7 @@ const initState = {
   sha384,
   sha512,
   ripemd160,
+  crc32,
   fileHashes: null,
   textHashes: null,
   textInput: '',

src/contexts/MainContextProvider/index.jsx

@@ -28,6 +28,7 @@ const autoUpdate = localStorage.autoUpdate && localStorage.autoUpdate === 'true'
 const minimizeEnabled = localStorage.minimizeEnabled && localStorage.minimizeEnabled === 'true' ? true : !localStorage.minimizeEnabled;
 const maximizeEnabled = localStorage.maximizeEnabled && localStorage.maximizeEnabled === 'true' ? true : !localStorage.maximizeEnabled;
 const languageEnabled = localStorage.languageEnabled && localStorage.languageEnabled === 'true' ? true : !localStorage.languageEnabled;
+const themeToggleEnabled = localStorage.themeToggleEnabled && localStorage.themeToggleEnabled === 'true' ? true : !localStorage.themeToggleEnabled;
 const canDragDrop = localStorage.canDragDrop && localStorage.canDragDrop === 'true' ? true : !localStorage.canDragDrop;
 
 const initState = {
@@ -53,6 +54,7 @@ const initState = {
   minimizeEnabled,
   maximizeEnabled,
   languageEnabled,
+  themeToggleEnabled,
   canDragDrop,
 };
 

src/languages/de_DE/index.js

@@ -40,6 +40,7 @@ const de_DE = () => ({
   sha512: 'SHA-512',
   ripemd160: 'RIPEMD-160',
   sha224: 'SHA-224',
+  crc32: 'CRC32',
   file: 'Datei',
   fileSubtitle: 'Berechnen Sie Datei-Hashes',
   text: 'Text',
@@ -80,6 +81,7 @@ const de_DE = () => ({
   dark: 'Dunkel',
   orange: 'Orange',
   orangeThemeDescription: 'Lass uns Niederländisch werden.',
+  themeToggleEnabled: 'Thema umschalten',
 });
 
 // eslint-disable-next-line camelcase

src/languages/en_US/index.js

@@ -40,6 +40,7 @@ const en_US = () => ({
   sha512: 'SHA-512',
   ripemd160: 'RIPEMD-160',
   sha224: 'SHA-224',
+  crc32: 'CRC32',
   file: 'File',
   fileSubtitle: 'Calculate file hashes',
   text: 'Text',
@@ -80,6 +81,7 @@ const en_US = () => ({
   dark: 'Dark',
   orange: 'Orange',
   orangeThemeDescription: 'Let\'s get Dutch.',
+  themeToggleEnabled: 'Theme toggle',
 });
 
 // eslint-disable-next-line camelcase

src/languages/es_ES/index.js

@@ -40,6 +40,7 @@ const es_ES = () => ({
   sha512: 'SHA-512',
   ripemd160: 'RIPEMD-160',
   sha224: 'SHA-224',
+  crc32: 'CRC32',
   file: 'Archivo',
   fileSubtitle: 'Calcular hashes de archivos',
   text: 'Texto',
@@ -80,6 +81,7 @@ const es_ES = () => ({
   dark: 'Oscuro',
   orange: 'Naranja',
   orangeThemeDescription: 'Vamos a holandeses.',
+  themeToggleEnabled: 'Alternar tema',
 });
 
 // eslint-disable-next-line camelcase

src/languages/fr_FR/index.js

@@ -40,6 +40,7 @@ const fr_FR = () => ({
   sha512: 'SHA-512',
   ripemd160: 'RIPEMD-160',
   sha224: 'SHA-224',
+  crc32: 'CRC32',
   file: 'File',
   fileSubtitle: 'Calculer les hachages de fichier',
   text: 'Texte',
@@ -80,6 +81,7 @@ const fr_FR = () => ({
   dark: 'Foncé',
   orange: 'Orange',
   orangeThemeDescription: 'Il faut que ça Néerlandais.',
+  themeToggleEnabled: 'Basculer le thème',
 });
 
 // eslint-disable-next-line camelcase