Merge pull request #13 from CodeDead/feature/refactoring

Fixed missing OK translation, code refactoring

Author: CodeDead

src/components/App/index.jsx

@@ -81,6 +81,13 @@ const App = () => {
       });
   };
 
+  /**
+   * Close the alert dialog
+   */
+  const closeAlertDialog = () => {
+    d1(setError(null));
+  };
+
   useEffect(() => {
     // eslint-disable-next-line no-underscore-dangle
     if (autoUpdate && window.__TAURI__) {
@@ -116,8 +123,8 @@ const App = () => {
             title={language.error}
             content={error}
             agreeLabel={language.ok}
-            onOk={() => d1(setError(null))}
-            onClose={() => d1(setError(null))}
+            onOk={closeAlertDialog}
+            onClose={closeAlertDialog}
           />
         ) : null}
         {update && update.updateAvailable ? (

src/components/ClippedDrawer/index.jsx

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React, { useContext } from 'react';
 import Box from '@mui/material/Box';
 import Drawer from '@mui/material/Drawer';
 import Toolbar from '@mui/material/Toolbar';
@@ -15,7 +15,6 @@ import LightbulbIcon from '@mui/icons-material/Lightbulb';
 import InfoIcon from '@mui/icons-material/Info';
 import SettingsIcon from '@mui/icons-material/Settings';
 import AttachMoneyIcon from '@mui/icons-material/AttachMoney';
-import { useContext } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { MainContext } from '../../contexts/MainContextProvider';
 import { openWebSite } from '../../reducers/MainReducer/Actions';

src/components/MuiVirtualizedTable/index.jsx

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import clsx from 'clsx';
 import TableCell from '@mui/material/TableCell';
 import { AutoSizer, Column, Table } from 'react-virtualized';

src/components/TopBar/index.jsx

@@ -1,8 +1,7 @@
-import * as React from 'react';
+import React, { useContext } from 'react';
 import AppBar from '@mui/material/AppBar';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
-import { useContext } from 'react';
 import IconButton from '@mui/material/IconButton';
 import Brightness5Icon from '@mui/icons-material/Brightness5';
 import Brightness7Icon from '@mui/icons-material/Brightness7';

src/languages/en_us.json

@@ -76,5 +76,6 @@
   "plainText": "Plain text",
   "notFound": "There's really nothing here except for some top secret stuff (maybe).",
   "notFoundGoHome": "Would you like to go back to the home page?",
-  "home": "Home"
+  "home": "Home",
+  "ok": "OK"
 }

src/languages/fr_fr.json

@@ -76,5 +76,6 @@
   "plainText": "Texte brut",
   "notFound": "Il n'y a rien ici",
   "notFoundGoHome": "Retour à l'accueil ?",
-  "home": "Accueil"
+  "home": "Accueil",
+  "ok": "OK"
 }

src/languages/nl_nl.json

@@ -76,5 +76,6 @@
   "plainText": "Tekst",
   "notFound": "Er is hier niets te zien.",
   "notFoundGoHome": "Naar de startpagina gaan?",
-  "home": "Startpagina"
+  "home": "Startpagina",
+  "ok": "Oké"
 }

src/routes/About/index.jsx

@@ -10,6 +10,7 @@ import packageJson from '../../../package.json';
 
 const About = () => {
   const [state, d1] = useContext(MainContext);
+
   const { languageIndex } = state;
   const language = state.languages[languageIndex];
 

src/routes/Advisor/index.jsx

@@ -12,6 +12,7 @@ import { setPageIndex } from '../../reducers/MainReducer/Actions';
 
 const Advisor = () => {
   const [state, d1] = useContext(MainContext);
+
   const { languageIndex } = state;
   const language = state.languages[languageIndex];
 

src/routes/Generate/index.jsx

@@ -3,7 +3,7 @@ import Container from '@mui/material/Container';
 import Button from '@mui/material/Button';
 import { createWorkerFactory, useWorker } from '@shopify/react-web-worker';
 import { styled } from '@mui/material/styles';
-import { Paper } from '@mui/material';
+import Paper from '@mui/material/Paper';
 import { save } from '@tauri-apps/api/dialog';
 import { invoke } from '@tauri-apps/api/tauri';
 import { MainContext } from '../../contexts/MainContextProvider';