Merge pull request #56 from CodeDead/release/v2.2.1

Release/v2.2.1

.eslintrc.json

@@ -12,13 +12,20 @@
     "ecmaFeatures": {
       "jsx": true
     },
-    "ecmaVersion": 12,
+    "ecmaVersion": 13,
     "sourceType": "module"
   },
   "plugins": [
     "react"
   ],
   "rules": {
+    "react/function-component-definition": [
+      2,
+      {
+        "namedComponents": "arrow-function",
+        "unnamedComponents": "arrow-function"
+      }
+    ],
     "react/prop-types": 0
   }
 }

.yarnrc.yml

@@ -4,4 +4,4 @@ plugins:
   - path: .yarn/plugins/yarn-up-all-plugin.cjs
     spec: "https://github.com/e5mode/yarn-up-all/releases/download/1.1.0/index.js"
 
-yarnPath: .yarn/releases/yarn-3.0.2.cjs
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

README.md

@@ -4,7 +4,7 @@
 
 ![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/v2.2.0/total)
+![GitHub Releases (by Release)](https://img.shields.io/github/downloads/CodeDead/DeadHash-js/v2.2.1/total)
 
 DeadHash is a free and open-source utility to calculate file and text hashes and checksums. The following calculations are supported:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deadhash",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "File and text hash calculator",
   "homepage": "./",
   "private": true,
@@ -12,7 +12,7 @@
   "build": {
     "appId": "com.codedead.deadhash",
     "productName": "DeadHash",
-    "copyright": "Copyright © 2021 ${author}",
+    "copyright": "Copyright © 2022 ${author}",
     "win": {
       "target": [
         "nsis",
@@ -35,19 +35,19 @@
   },
   "main": "public/electron.js",
   "dependencies": {
-    "@emotion/react": "^11.4.1",
-    "@emotion/styled": "^11.3.0",
-    "@mui/icons-material": "^5.0.1",
-    "@mui/material": "^5.0.2",
-    "crc": "^3.8.0",
+    "@emotion/react": "^11.7.1",
+    "@emotion/styled": "^11.6.0",
+    "@mui/icons-material": "^5.2.5",
+    "@mui/material": "^5.2.7",
+    "crc": "^4.1.0",
     "cross-env": "^7.0.3",
     "electron-is-dev": "^2.0.0",
     "react": "^17.0.2",
     "react-contexify": "^5.0.0",
     "react-dom": "^17.0.2",
-    "react-router": "^5.2.1",
-    "react-router-dom": "^5.3.0",
-    "react-scripts": "^4.0.3"
+    "react-router": "^6.2.1",
+    "react-router-dom": "^6.2.1",
+    "react-scripts": "^5.0.0"
   },
   "scripts": {
     "react-start": "react-scripts start",
@@ -72,15 +72,16 @@
     ]
   },
   "devDependencies": {
-    "concurrently": "^6.2.2",
-    "electron": "^15.0.0",
-    "electron-builder": "^22.11.7",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "concurrently": "^7.0.0",
+    "electron": "^16.0.6",
+    "electron-builder": "^22.14.5",
+    "eslint": "^8.6.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
     "wait-on": "^6.0.0"
-  }
+  },
+  "packageManager": "yarn@3.1.1"
 }

src/components/App/index.jsx

@@ -1,5 +1,5 @@
 import React, { useContext, useEffect } from 'react';
-import { BrowserRouter, Switch, Route } from 'react-router-dom';
+import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import { CssBaseline } from '@mui/material';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import ThemeSelector from '../../utils/ThemeSelector';
@@ -73,23 +73,13 @@ const App = () => {
         <DropZone enabled={enabled} onDrop={onDrop} reRoute="/file">
           <TopBar />
           <CssBaseline />
-          <Switch>
-            <Route path="/settings">
-              <Settings />
-            </Route>
-            <Route path="/about">
-              <About />
-            </Route>
-            <Route path="/file">
-              <File />
-            </Route>
-            <Route path="/text">
-              <Text />
-            </Route>
-            <Route path="/">
-              <Home />
-            </Route>
-          </Switch>
+          <Routes>
+            <Route path="/settings" element={<Settings />} />
+            <Route path="/about" element={<About />} />
+            <Route path="/file" element={<File />} />
+            <Route path="/text" element={<Text />} />
+            <Route path="/" element={<Home />} />
+          </Routes>
         </DropZone>
       </BrowserRouter>
     </ThemeProvider>

src/components/BackButton/index.jsx

@@ -1,17 +1,17 @@
 import React from 'react';
 import Button from '@mui/material/Button';
 import ArrowLeftIcon from '@mui/icons-material/KeyboardArrowLeft';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 
 const BackButton = () => {
-  const history = useHistory();
+  const navigate = useNavigate();
   /**
    * Call the goBack event
    * @param e The event argument
    */
   const back = (e) => {
     if (e) e.preventDefault();
-    history.goBack();
+    navigate(-1);
   };
 
   return (

src/components/DrawerBar/index.jsx

@@ -14,7 +14,7 @@ import InfoIcon from '@mui/icons-material/Info';
 import BuildIcon from '@mui/icons-material/Build';
 import HelpIcon from '@mui/icons-material/Help';
 import CloseIcon from '@mui/icons-material/Close';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import CryptographyMenu from '../CryptographyMenu';
 import { MainContext } from '../../contexts/MainContextProvider';
 
@@ -25,7 +25,7 @@ const DrawerBar = ({ open, onClose }) => {
   const language = state.languages[state.languageIndex];
   const selectedItem = state.selectedListItem;
 
-  const history = useHistory();
+  const navigate = useNavigate();
   const theme = useTheme();
 
   /**
@@ -45,22 +45,22 @@ const DrawerBar = ({ open, onClose }) => {
 
     switch (index) {
       case 1:
-        history.push('/file');
+        navigate('/file');
         break;
       case 2:
-        history.push('/text');
+        navigate('/text');
         break;
       case 3:
-        history.push('/settings');
+        navigate('/settings');
         break;
       case 4:
         window.open('https://codedead.com/Software/DeadHash/help.pdf', '_blank');
         break;
       case 5:
-        history.push('/about');
+        navigate('/about');
         break;
       default:
-        history.push('/');
+        navigate('/');
         break;
     }
   };

src/components/DropZone/index.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { useHistory } from 'react-router';
+import { useNavigate } from 'react-router';
 
 const DropZone = ({
   children, onDrop, enabled, reRoute,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
 
   /**
    * Event that is fired when one or more files are dropped
@@ -15,7 +15,7 @@ const DropZone = ({
     if (!enabled) return;
 
     if (onDrop) onDrop(e.dataTransfer.files[0]);
-    if (reRoute) history.push(reRoute);
+    if (reRoute) navigate(reRoute);
   };
 
   /**

src/contexts/CryptoContextReducer/index.jsx

@@ -49,6 +49,7 @@ const CryptoContextProvider = ({ children }) => {
   const [state, dispatch] = useReducer(CryptoReducer, initState);
 
   return (
+    // eslint-disable-next-line react/jsx-no-constructed-context-values
     <CryptoContext.Provider value={[state, dispatch]}>
       {children}
     </CryptoContext.Provider>

src/contexts/MainContextProvider/index.jsx

@@ -64,6 +64,7 @@ const MainContextProvider = ({ children }) => {
   const [state, dispatch] = useReducer(MainReducer, initState);
 
   return (
+    // eslint-disable-next-line react/jsx-no-constructed-context-values
     <MainContext.Provider value={[state, dispatch]}>
       {children}
     </MainContext.Provider>

src/languages/de_DE/index.js

@@ -7,7 +7,7 @@ const de_DE = () => ({
   help: 'Hilfe',
   language: 'Sprache',
   aboutSubtitle: 'Erfahren Sie mehr über DeadHash',
-  aboutMessage: 'DeadHash wurde von DeadLine erstellt.\n\nEinige Bilder wurden von icons8 bereitgestellt: https://icons8.com\nLizenz: GPLv3\nVersion: {x}\n\nCopyright © 2021 CodeDead',
+  aboutMessage: 'DeadHash wurde von DeadLine erstellt.\n\nEinige Bilder wurden von icons8 bereitgestellt: https://icons8.com\nLizenz: GPLv3\nVersion: {x}\n\nCopyright © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Thema',
   general: 'Allgemeines',
@@ -54,7 +54,6 @@ const de_DE = () => ({
   cancel: 'Stornieren',
   ok: 'OK',
   errorTitle: 'Ein Fehler ist aufgetreten!',
-  input: 'Eingabe',
   compare: 'Vergleichen',
   compareHash: 'Dein Hash hier',
   calculate: 'Berechnung',

src/languages/en_US/index.js

@@ -7,7 +7,7 @@ const en_US = () => ({
   help: 'Help',
   language: 'Language',
   aboutSubtitle: 'Learn more about DeadHash',
-  aboutMessage: 'DeadHash was created by DeadLine.\n\nSome images were provided by icons8: https://icons8.com\nLicense: GPLv3\nVersion: {x}\n\nCopyright © 2021 CodeDead',
+  aboutMessage: 'DeadHash was created by DeadLine.\n\nSome images were provided by icons8: https://icons8.com\nLicense: GPLv3\nVersion: {x}\n\nCopyright © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Theme',
   general: 'General',
@@ -54,7 +54,6 @@ const en_US = () => ({
   cancel: 'Cancel',
   ok: 'OK',
   errorTitle: 'An error occurred!',
-  input: 'Input',
   compare: 'Compare',
   compareHash: 'Your hash here',
   calculate: 'Calculate',

src/languages/es_ES/index.js

@@ -7,7 +7,7 @@ const es_ES = () => ({
   help: 'Ayuda',
   language: 'Idioma',
   aboutSubtitle: 'Obtenga más información sobre DeadHash',
-  aboutMessage: 'DeadHash fue creado por DeadLine.\n\nAlgunas imágenes fueron proporcionadas por icons8: https://icons8.com\nLicencia: GPLv3\nVersión: {x}\n\nCopyright © 2021 CodeDead',
+  aboutMessage: 'DeadHash fue creado por DeadLine.\n\nAlgunas imágenes fueron proporcionadas por icons8: https://icons8.com\nLicencia: GPLv3\nVersión: {x}\n\nCopyright © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Tema',
   general: 'General',
@@ -54,7 +54,6 @@ const es_ES = () => ({
   cancel: 'Cancelar',
   ok: 'Bueno',
   errorTitle: '¡Ocurrió un error!',
-  input: 'Entrada',
   compare: 'Comparar',
   compareHash: 'Tu hash aquí',
   calculate: 'Calcular',

src/languages/fr_FR/index.js

@@ -7,7 +7,7 @@ const fr_FR = () => ({
   help: 'Aide',
   language: 'Langue',
   aboutSubtitle: 'En savoir plus sur DeadHash',
-  aboutMessage: 'DeadHash a été créé par DeadLine.\n\nCertaines images ont été fournies par icons8: https://icons8.com\nLicence: GPLv3\nVersion: {x}\n\nCopyright © 2021 CodeDead',
+  aboutMessage: 'DeadHash a été créé par DeadLine.\n\nCertaines images ont été fournies par icons8: https://icons8.com\nLicence: GPLv3\nVersion: {x}\n\nCopyright © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Thème',
   general: 'Général',
@@ -54,7 +54,6 @@ const fr_FR = () => ({
   cancel: 'Annuler',
   ok: 'OK',
   errorTitle: 'Une erreur est survenue!',
-  input: 'Données d\'entrée',
   compare: 'Comparer',
   compareHash: 'Votre hachage ici',
   calculate: 'Calculer',

src/languages/it_IT/index.js

@@ -7,7 +7,7 @@ const it_IT = () => ({
   help: 'Aiuto',
   language: 'Linguaggio',
   aboutSubtitle: 'Ulteriori informazioni su DeadHash',
-  aboutMessage: 'DeadHash è stato creato da DeadLine.\n\nAlcune immagini sono state fornite da icons8: https://icons8.com\nLicenza: GPLv3\nVersione: {x}\n\nCopyright © 2021 CodeDead',
+  aboutMessage: 'DeadHash è stato creato da DeadLine.\n\nAlcune immagini sono state fornite da icons8: https://icons8.com\nLicenza: GPLv3\nVersione: {x}\n\nCopyright © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Tema',
   general: 'Generale',
@@ -54,7 +54,6 @@ const it_IT = () => ({
   cancel: 'Annulla',
   ok: 'OK',
   errorTitle: 'Si è verificato un errore!',
-  input: 'Ingresso',
   compare: 'Confrontare',
   compareHash: 'Il tuo hash qui',
   calculate: 'Calcolare',

src/languages/jp_JP/index.js

@@ -7,7 +7,7 @@ const jp_JP = () => ({
   help: '助けて',
   language: '言語',
   aboutSubtitle: 'DeadHashの詳細',
-  aboutMessage: 'DeadHashはDeadLineによって作成されました。\n\n一部の画像は、icons8によって提供されました：https://icons8.com\nライセンス：GPLv3\nバージョン：{x}\n\n著作権©2021 CodeDead',
+  aboutMessage: 'DeadHashはDeadLineによって作成されました。\n\n一部の画像は、icons8によって提供されました：https://icons8.com\nライセンス：GPLv3\nバージョン：{x}\n\n著作権©2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'テーマ',
   general: '全般',
@@ -54,7 +54,6 @@ const jp_JP = () => ({
   cancel: 'キャンセル',
   ok: 'オーケー',
   errorTitle: 'エラーが発生しました！',
-  input: '入力',
   compare: '比較する',
   compareHash: 'ここにあなたのハッシュ',
   calculate: '計算する',

src/languages/nl_NL/index.js

@@ -7,7 +7,7 @@ const nl_NL = () => ({
   help: 'Help',
   language: 'Taal',
   aboutSubtitle: 'Leer meer over DeadHash',
-  aboutMessage: 'DeadHash werd gemaakt door DeadLine.\n\nSommige afbeeldingen werden afgeleverd door icons8: https://icons8.com\nLicentie: GPLv3\nVersie: {x}\n\nCopyright © 2021 CodeDead',
+  aboutMessage: 'DeadHash werd gemaakt door DeadLine.\n\nSommige afbeeldingen werden afgeleverd door icons8: https://icons8.com\nLicentie: GPLv3\nVersie: {x}\n\nCopyright © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Thema',
   general: 'Algemeen',
@@ -54,7 +54,6 @@ const nl_NL = () => ({
   cancel: 'Annuleren',
   ok: 'OK',
   errorTitle: 'Er is een fout opgetreden!',
-  input: 'Input',
   compare: 'Vergelijken',
   compareHash: 'Jouw hash hier',
   calculate: 'Bereken',

src/languages/pt_PT/index.js

@@ -7,7 +7,7 @@ const pt_PT = () => ({
   help: 'Socorro',
   language: 'Língua',
   aboutSubtitle: 'Saiba mais sobre o DeadHash',
-  aboutMessage: 'DeadHash foi criado por DeadLine.\n\nAlgumas imagens foram fornecidas por icons8: https://icons8.com\nLicença: GPLv3\nVersão: {x}\n\nDireitos autorais © 2021 CodeDead',
+  aboutMessage: 'DeadHash foi criado por DeadLine.\n\nAlgumas imagens foram fornecidas por icons8: https://icons8.com\nLicença: GPLv3\nVersão: {x}\n\nDireitos autorais © 2022 CodeDead',
   codedead: 'CodeDead',
   theme: 'Tema',
   general: 'Geral',
@@ -54,7 +54,6 @@ const pt_PT = () => ({
   cancel: 'Cancelar',
   ok: 'OK',
   errorTitle: 'Um erro ocorreu!',
-  input: 'Entrada',
   compare: 'Comparar',
   compareHash: 'Seu hash aqui',
   calculate: 'Calcular',