Skip to content

Commit 0a73792

Browse files
CodeDeadCodeDead
authored
Merge pull request #62 from CodeDead/feature/refactoring
Dependency upgrades, Yarn upgrade, removed home page, changed default…
2 parents 094a439 + a5d33aa commit 0a73792

File tree

14 files changed

+1558
-1720
lines changed

14 files changed

+1558
-1720
lines changed

‎.yarn/releases/yarn-3.2.1.cjs‎

Lines changed: 0 additions & 786 deletions
This file was deleted.

‎.yarn/releases/yarn-3.2.2.cjs‎

Lines changed: 783 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-3.2.1.cjs
3+
yarnPath: .yarn/releases/yarn-3.2.2.cjs

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@emotion/react": "^11.9.3",
3939
"@emotion/styled": "^11.9.3",
4040
"@mui/icons-material": "^5.8.4",
41-
"@mui/material": "^5.8.6",
41+
"@mui/material": "^5.9.1",
4242
"crc": "^4.1.1",
4343
"cross-env": "^7.0.3",
4444
"electron-is-dev": "^2.0.0",
@@ -71,16 +71,16 @@
7171
]
7272
},
7373
"devDependencies": {
74-
"concurrently": "^7.2.2",
75-
"electron": "^19.0.6",
74+
"concurrently": "^7.3.0",
75+
"electron": "^19.0.9",
7676
"electron-builder": "^23.1.0",
77-
"eslint": "^8.18.0",
77+
"eslint": "^8.20.0",
7878
"eslint-config-airbnb": "^19.0.4",
7979
"eslint-plugin-import": "^2.26.0",
80-
"eslint-plugin-jsx-a11y": "^6.6.0",
80+
"eslint-plugin-jsx-a11y": "^6.6.1",
8181
"eslint-plugin-react": "^7.30.1",
8282
"eslint-plugin-react-hooks": "^4.6.0",
8383
"wait-on": "^6.0.1"
8484
},
85-
"packageManager": "yarn@3.2.1"
85+
"packageManager": "yarn@3.2.2"
8686
}

‎src/components/App/index.jsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
setFileHashes,
1414
setFileHashLoading, setTextHashError, setTextHashes, setTextHashLoading,
1515
} from '../../reducers/CryptoReducer/Actions';
16-
import Home from '../../routes/Home';
1716
import Text from '../../routes/Text';
1817
import File from '../../routes/File';
1918
import About from '../../routes/About';
@@ -74,12 +73,12 @@ const App = () => {
7473
<TopBar />
7574
<CssBaseline />
7675
<Routes>
77-
<Route exact path="/" element={<Home />} />
76+
<Route exact path="/" element={<File />} />
7877
<Route exact path="/settings" element={<Settings />} />
7978
<Route exact path="/about" element={<About />} />
8079
<Route exact path="/file" element={<File />} />
8180
<Route exact path="/text" element={<Text />} />
82-
<Route path="*" element={<Home />} />
81+
<Route path="*" element={<File />} />
8382
</Routes>
8483
</DropZone>
8584
</BrowserRouter>

‎src/components/CopyPasteMenu/index.jsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@ const CopyPasteMenu = ({
3636
<Menu id={MENU_ID}>
3737
<Item onClick={() => copyData()}>
3838
<CopyIcon />
39-
{' '}
40-
{copy}
39+
{` ${copy}`}
4140
</Item>
4241
<Item onClick={() => pasteData()}>
4342
<PasteIcon />
44-
{' '}
45-
{paste}
43+
{` ${paste}`}
4644
</Item>
4745
</Menu>
4846
</>

‎src/components/CryptographyMenu/index.jsx‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { useState } from 'react';
2-
import ListItem from '@mui/material/ListItem';
32
import Collapse from '@mui/material/Collapse';
43
import ListItemIcon from '@mui/material/ListItemIcon';
54
import ListItemText from '@mui/material/ListItemText';
65
import List from '@mui/material/List';
76
import ExpandLessIcon from '@mui/icons-material/ExpandLess';
87
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
98
import KeyIcon from '@mui/icons-material/VpnKey';
9+
import ListItemButton from '@mui/material/ListItemButton';
1010
import { useTheme } from '@mui/material';
1111

1212
const CryptographyMenu = ({
@@ -24,34 +24,32 @@ const CryptographyMenu = ({
2424

2525
return (
2626
<List>
27-
<ListItem button selected={selectedIndex === 0}>
28-
<ListItemIcon onClick={() => handleIndexChange(0)}><KeyIcon /></ListItemIcon>
29-
<ListItemText onClick={() => handleIndexChange(0)} primary={cryptography} />
27+
<ListItemButton selected={selectedIndex === 0}>
28+
<ListItemIcon onClick={handleOpenMenu}><KeyIcon /></ListItemIcon>
29+
<ListItemText onClick={handleOpenMenu} primary={cryptography} />
3030
{openCollapse ? <ExpandLessIcon color="inherit" onClick={handleOpenMenu} />
3131
: <ExpandMoreIcon color="inherit" onClick={handleOpenMenu} />}
32-
</ListItem>
32+
</ListItemButton>
3333
<Collapse in={openCollapse} timeout="auto" unmountOnExit>
3434
<List component="div" disablePadding>
35-
<ListItem
35+
<ListItemButton
3636
selected={selectedIndex === 1}
37-
button
3837
sx={{
3938
paddingLeft: theme.spacing(4),
4039
}}
4140
onClick={() => handleIndexChange(1)}
4241
>
4342
<ListItemText inset primary={file} />
44-
</ListItem>
45-
<ListItem
43+
</ListItemButton>
44+
<ListItemButton
4645
selected={selectedIndex === 2}
47-
button
4846
sx={{
4947
paddingLeft: theme.spacing(4),
5048
}}
5149
onClick={() => handleIndexChange(2)}
5250
>
5351
<ListItemText inset primary={text} />
54-
</ListItem>
52+
</ListItemButton>
5553
</List>
5654
</Collapse>
5755
</List>

‎src/components/DrawerBar/index.jsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import Divider from '@mui/material/Divider';
77
import IconButton from '@mui/material/IconButton';
88
import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
99
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
10-
import ListItem from '@mui/material/ListItem';
1110
import ListItemIcon from '@mui/material/ListItemIcon';
1211
import ListItemText from '@mui/material/ListItemText';
1312
import InfoIcon from '@mui/icons-material/Info';
1413
import BuildIcon from '@mui/icons-material/Build';
1514
import HelpIcon from '@mui/icons-material/Help';
1615
import CloseIcon from '@mui/icons-material/Close';
1716
import { useNavigate } from 'react-router-dom';
17+
import ListItemButton from '@mui/material/ListItemButton';
1818
import CryptographyMenu from '../CryptographyMenu';
1919
import { MainContext } from '../../contexts/MainContextProvider';
2020

@@ -99,33 +99,33 @@ const DrawerBar = ({ open, onClose }) => {
9999
<Divider />
100100

101101
<List>
102-
<ListItem onClick={() => handleIndexChange(3)} selected={selectedItem === 3} button>
102+
<ListItemButton onClick={() => handleIndexChange(3)} selected={selectedItem === 3}>
103103
<ListItemIcon><BuildIcon color="inherit" /></ListItemIcon>
104104
<ListItemText primary={language.settings} />
105-
</ListItem>
105+
</ListItemButton>
106106
</List>
107107

108108
<Divider />
109109

110110
<List>
111-
<ListItem onClick={() => handleIndexChange(4)} button>
111+
<ListItemButton onClick={() => handleIndexChange(4)}>
112112
<ListItemIcon><HelpIcon color="inherit" /></ListItemIcon>
113113
<ListItemText primary={language.help} />
114-
</ListItem>
114+
</ListItemButton>
115115

116-
<ListItem onClick={() => handleIndexChange(5)} selected={selectedItem === 5} button>
116+
<ListItemButton onClick={() => handleIndexChange(5)} selected={selectedItem === 5}>
117117
<ListItemIcon><InfoIcon color="inherit" /></ListItemIcon>
118118
<ListItemText primary={language.about} />
119-
</ListItem>
119+
</ListItemButton>
120120
</List>
121121

122122
<Divider />
123123

124124
<List>
125-
<ListItem onClick={() => ipcRenderer.send('handle-close')} button>
125+
<ListItemButton onClick={() => ipcRenderer.send('handle-close')}>
126126
<ListItemIcon><CloseIcon color="inherit" /></ListItemIcon>
127127
<ListItemText primary={language.exit} />
128-
</ListItem>
128+
</ListItemButton>
129129
</List>
130130
</Box>
131131
</Drawer>

‎src/contexts/MainContextProvider/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const themeIndex = localStorage.themeIndex ? parseFloat(localStorage.themeIndex)
2727
const autoUpdate = localStorage.autoUpdate && localStorage.autoUpdate === 'true' ? true : !localStorage.autoUpdate;
2828
const minimizeEnabled = localStorage.minimizeEnabled && localStorage.minimizeEnabled === 'true' ? true : !localStorage.minimizeEnabled;
2929
const maximizeEnabled = localStorage.maximizeEnabled && localStorage.maximizeEnabled === 'true' ? true : !localStorage.maximizeEnabled;
30-
const languageEnabled = localStorage.languageEnabled && localStorage.languageEnabled === 'true' ? true : !localStorage.languageEnabled;
31-
const themeToggleEnabled = localStorage.themeToggleEnabled && localStorage.themeToggleEnabled === 'true' ? true : !localStorage.themeToggleEnabled;
30+
const languageEnabled = !!(localStorage.languageEnabled && localStorage.languageEnabled === 'true');
31+
const themeToggleEnabled = !!(localStorage.themeToggleEnabled && localStorage.themeToggleEnabled === 'true');
3232
const canDragDrop = localStorage.canDragDrop && localStorage.canDragDrop === 'true' ? true : !localStorage.canDragDrop;
3333

3434
const initState = {

‎src/reducers/MainReducer/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ const MainReducer = (state, action) => {
5656
localStorage.autoUpdate = true;
5757
localStorage.minimizeEnabled = true;
5858
localStorage.maximizeEnabled = true;
59-
localStorage.languageEnabled = true;
59+
localStorage.languageEnabled = false;
6060
localStorage.canDragDrop = true;
61-
localStorage.themeToggleEnabled = true;
61+
localStorage.themeToggleEnabled = false;
6262

6363
return {
6464
...state,
@@ -68,9 +68,9 @@ const MainReducer = (state, action) => {
6868
autoUpdate: true,
6969
minimizeEnabled: true,
7070
maximizeEnabled: true,
71-
languageEnabled: true,
71+
languageEnabled: false,
7272
canDragDrop: true,
73-
themeToggleEnabled: true,
73+
themeToggleEnabled: false,
7474
};
7575
case SET_MINIMIZE_STATUS:
7676
localStorage.minimizeEnabled = action.payload;

0 commit comments

Comments
 (0)