Merge pull request #63 from CodeDead/release/v2.2.3

Release/v2.2.3
CodeDead · Jul 22, 2022 · 3dd4015 · 3dd4015
2 parents 094a439 + f5eff0d
commit 3dd4015
Show file tree

Hide file tree

Showing 15 changed files with 1,560 additions and 1,722 deletions.
diff --git a/.yarn/releases/yarn-3.2.1.cjs b/.yarn/releases/yarn-3.2.1.cjs
diff --git a/.yarn/releases/yarn-3.2.2.cjs b/.yarn/releases/yarn-3.2.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.2.cjs
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deadhash",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "File and text hash calculator",
   "homepage": "./",
   "private": true,
@@ -38,7 +38,7 @@
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
     "@mui/icons-material": "^5.8.4",
-    "@mui/material": "^5.8.6",
+    "@mui/material": "^5.9.1",
     "crc": "^4.1.1",
     "cross-env": "^7.0.3",
     "electron-is-dev": "^2.0.0",
@@ -71,16 +71,16 @@
     ]
   },
   "devDependencies": {
-    "concurrently": "^7.2.2",
-    "electron": "^19.0.6",
+    "concurrently": "^7.3.0",
+    "electron": "^19.0.9",
     "electron-builder": "^23.1.0",
-    "eslint": "^8.18.0",
+    "eslint": "^8.20.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "wait-on": "^6.0.1"
   },
-  "packageManager": "yarn@3.2.1"
+  "packageManager": "yarn@3.2.2"
 }
diff --git a/src/components/App/index.jsx b/src/components/App/index.jsx
@@ -13,7 +13,6 @@ import {
   setFileHashes,
   setFileHashLoading, setTextHashError, setTextHashes, setTextHashLoading,
 } from '../../reducers/CryptoReducer/Actions';
-import Home from '../../routes/Home';
 import Text from '../../routes/Text';
 import File from '../../routes/File';
 import About from '../../routes/About';
@@ -74,12 +73,12 @@ const App = () => {
           <TopBar />
           <CssBaseline />
           <Routes>
-            <Route exact path="/" element={<Home />} />
+            <Route exact path="/" element={<File />} />
             <Route exact path="/settings" element={<Settings />} />
             <Route exact path="/about" element={<About />} />
             <Route exact path="/file" element={<File />} />
             <Route exact path="/text" element={<Text />} />
-            <Route path="*" element={<Home />} />
+            <Route path="*" element={<File />} />
           </Routes>
         </DropZone>
       </BrowserRouter>

diff --git a/src/components/CopyPasteMenu/index.jsx b/src/components/CopyPasteMenu/index.jsx
@@ -36,13 +36,11 @@ const CopyPasteMenu = ({
       <Menu id={MENU_ID}>
         <Item onClick={() => copyData()}>
           <CopyIcon />
-          {' '}
-          {copy}
+          {` ${copy}`}
         </Item>
         <Item onClick={() => pasteData()}>
           <PasteIcon />
-          {' '}
-          {paste}
+          {` ${paste}`}
         </Item>
       </Menu>
     </>

diff --git a/src/components/CryptographyMenu/index.jsx b/src/components/CryptographyMenu/index.jsx
@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
-import ListItem from '@mui/material/ListItem';
 import Collapse from '@mui/material/Collapse';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import List from '@mui/material/List';
 import ExpandLessIcon from '@mui/icons-material/ExpandLess';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import KeyIcon from '@mui/icons-material/VpnKey';
+import ListItemButton from '@mui/material/ListItemButton';
 import { useTheme } from '@mui/material';
 
 const CryptographyMenu = ({
@@ -24,34 +24,32 @@ const CryptographyMenu = ({
 
   return (
     <List>
-      <ListItem button selected={selectedIndex === 0}>
-        <ListItemIcon onClick={() => handleIndexChange(0)}><KeyIcon /></ListItemIcon>
-        <ListItemText onClick={() => handleIndexChange(0)} primary={cryptography} />
+      <ListItemButton selected={selectedIndex === 0}>
+        <ListItemIcon onClick={handleOpenMenu}><KeyIcon /></ListItemIcon>
+        <ListItemText onClick={handleOpenMenu} primary={cryptography} />
         {openCollapse ? <ExpandLessIcon color="inherit" onClick={handleOpenMenu} />
           : <ExpandMoreIcon color="inherit" onClick={handleOpenMenu} />}
-      </ListItem>
+      </ListItemButton>
       <Collapse in={openCollapse} timeout="auto" unmountOnExit>
         <List component="div" disablePadding>
-          <ListItem
+          <ListItemButton
             selected={selectedIndex === 1}
-            button
             sx={{
               paddingLeft: theme.spacing(4),
             }}
             onClick={() => handleIndexChange(1)}
           >
             <ListItemText inset primary={file} />
-          </ListItem>
-          <ListItem
+          </ListItemButton>
+          <ListItemButton
             selected={selectedIndex === 2}
-            button
             sx={{
               paddingLeft: theme.spacing(4),
             }}
             onClick={() => handleIndexChange(2)}
           >
             <ListItemText inset primary={text} />
-          </ListItem>
+          </ListItemButton>
         </List>
       </Collapse>
     </List>

diff --git a/src/components/DrawerBar/index.jsx b/src/components/DrawerBar/index.jsx
@@ -7,14 +7,14 @@ import Divider from '@mui/material/Divider';
 import IconButton from '@mui/material/IconButton';
 import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
-import ListItem from '@mui/material/ListItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 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 { useNavigate } from 'react-router-dom';
+import ListItemButton from '@mui/material/ListItemButton';
 import CryptographyMenu from '../CryptographyMenu';
 import { MainContext } from '../../contexts/MainContextProvider';
 
@@ -99,33 +99,33 @@ const DrawerBar = ({ open, onClose }) => {
         <Divider />
 
         <List>
-          <ListItem onClick={() => handleIndexChange(3)} selected={selectedItem === 3} button>
+          <ListItemButton onClick={() => handleIndexChange(3)} selected={selectedItem === 3}>
             <ListItemIcon><BuildIcon color="inherit" /></ListItemIcon>
             <ListItemText primary={language.settings} />
-          </ListItem>
+          </ListItemButton>
         </List>
 
         <Divider />
 
         <List>
-          <ListItem onClick={() => handleIndexChange(4)} button>
+          <ListItemButton onClick={() => handleIndexChange(4)}>
             <ListItemIcon><HelpIcon color="inherit" /></ListItemIcon>
             <ListItemText primary={language.help} />
-          </ListItem>
+          </ListItemButton>
 
-          <ListItem onClick={() => handleIndexChange(5)} selected={selectedItem === 5} button>
+          <ListItemButton onClick={() => handleIndexChange(5)} selected={selectedItem === 5}>
             <ListItemIcon><InfoIcon color="inherit" /></ListItemIcon>
             <ListItemText primary={language.about} />
-          </ListItem>
+          </ListItemButton>
         </List>
 
         <Divider />
 
         <List>
-          <ListItem onClick={() => ipcRenderer.send('handle-close')} button>
+          <ListItemButton onClick={() => ipcRenderer.send('handle-close')}>
             <ListItemIcon><CloseIcon color="inherit" /></ListItemIcon>
             <ListItemText primary={language.exit} />
-          </ListItem>
+          </ListItemButton>
         </List>
       </Box>
     </Drawer>

diff --git a/src/contexts/MainContextProvider/index.jsx b/src/contexts/MainContextProvider/index.jsx
@@ -27,8 +27,8 @@ const themeIndex = localStorage.themeIndex ? parseFloat(localStorage.themeIndex)
 const autoUpdate = localStorage.autoUpdate && localStorage.autoUpdate === 'true' ? true : !localStorage.autoUpdate;
 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 languageEnabled = !!(localStorage.languageEnabled && localStorage.languageEnabled === 'true');
+const themeToggleEnabled = !!(localStorage.themeToggleEnabled && localStorage.themeToggleEnabled === 'true');
 const canDragDrop = localStorage.canDragDrop && localStorage.canDragDrop === 'true' ? true : !localStorage.canDragDrop;
 
 const initState = {

diff --git a/src/reducers/MainReducer/index.js b/src/reducers/MainReducer/index.js
@@ -56,9 +56,9 @@ const MainReducer = (state, action) => {
       localStorage.autoUpdate = true;
       localStorage.minimizeEnabled = true;
       localStorage.maximizeEnabled = true;
-      localStorage.languageEnabled = true;
+      localStorage.languageEnabled = false;
       localStorage.canDragDrop = true;
-      localStorage.themeToggleEnabled = true;
+      localStorage.themeToggleEnabled = false;
 
       return {
         ...state,
@@ -68,9 +68,9 @@ const MainReducer = (state, action) => {
         autoUpdate: true,
         minimizeEnabled: true,
         maximizeEnabled: true,
-        languageEnabled: true,
+        languageEnabled: false,
         canDragDrop: true,
-        themeToggleEnabled: true,
+        themeToggleEnabled: false,
       };
     case SET_MINIMIZE_STATUS:
       localStorage.minimizeEnabled = action.payload;

diff --git a/src/routes/About/index.jsx b/src/routes/About/index.jsx
@@ -18,7 +18,7 @@ const { ipcRenderer } = window.require('electron');
 
 let appVersion;
 
-ipcRenderer.on('get-version-reply', (e, version) => {
+ipcRenderer.on('get-version-reply', (_e, version) => {
   appVersion = version;
 });
 

diff --git a/src/routes/Home/index.jsx b/src/routes/Home/index.jsx