Merge pull request #55 from CodeDead/feature/upgrades

feature/upgrades

Author: CodeDead

.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
   }
 }

.yarn/releases/yarn-3.0.2.cjs

@@ -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

.yarn/releases/yarn-3.1.1.cjs

@@ -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"
 }

.yarnrc.yml

@@ -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>

package.json

@@ -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/App/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/BackButton/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/components/DrawerBar/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>