Skip to content

Commit

Permalink
Merge pull request #1847 from proddy/dev
Browse files Browse the repository at this point in the history
minor updates
  • Loading branch information
proddy authored Jul 6, 2024
2 parents af07572 + 7f0cbe7 commit dec7e2e
Show file tree
Hide file tree
Showing 9 changed files with 137 additions and 117 deletions.
2 changes: 1 addition & 1 deletion interface/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default tseslint.config(
}
},
{
ignores: ['dist/*', '*.js', '**/*.cjs', '**/unpack.ts']
ignores: ['dist/*', '*.js', '**/*.cjs', '**/unpack.ts', 'i18*.ts']
},
{
rules: {
Expand Down
8 changes: 4 additions & 4 deletions interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@alova/scene-react": "^1.6.1",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.21",
"@mui/material": "^5.15.21",
"@mui/icons-material": "^5.16.0",
"@mui/material": "^5.16.0",
"@table-library/react-table-library": "4.1.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.14.9",
"@types/node": "^20.14.10",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.3.3",
Expand Down Expand Up @@ -63,7 +63,7 @@
"prettier": "^3.3.2",
"rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.31.1",
"typescript-eslint": "^7.15.0",
"typescript-eslint": "8.0.0-alpha.10",
"vite": "^5.3.3",
"vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.3.2"
Expand Down
2 changes: 1 addition & 1 deletion interface/src/contexts/authentication/Authentication.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
const decodedMe = AuthenticationApi.decodeMeJWT(accessToken);
setMe(decodedMe);
toast.success(LL.LOGGED_IN({ name: decodedMe.username }));
} catch (error) {
} catch {
setMe(undefined);
throw new Error('Failed to parse JWT');
}
Expand Down
2 changes: 1 addition & 1 deletion interface/src/framework/system/RestartMonitor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const RestartMonitor: FC = () => {
try {
await send();
document.location.href = '/';
} catch (error) {
} catch {
if (new Date().getTime() < timeoutAt.current) {
setTimeoutId(setTimeout(poll.current, POLL_INTERVAL));
} else {
Expand Down
12 changes: 6 additions & 6 deletions interface/src/framework/system/SystemStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,20 +287,20 @@ const SystemStatus: FC = () => {
<Button
startIcon={<PowerSettingsNewIcon />}
variant="outlined"
onClick={restart}
onClick={partition}
disabled={processing}
color="error"
color="warning"
>
{LL.RESTART()}
EMS-ESP Loader
</Button>
<Button
startIcon={<PowerSettingsNewIcon />}
variant="outlined"
onClick={partition}
onClick={restart}
disabled={processing}
color="warning"
color="error"
>
EMS-ESP Loader
{LL.RESTART()}
</Button>
</DialogActions>
</Dialog>
Expand Down
Loading

0 comments on commit dec7e2e

Please sign in to comment.