Merge pull request emsesp#1507 from proddy/dev

add SK
proddy · Dec 16, 2023 · ef2ed0f · ef2ed0f
2 parents 68cb945 + 68084fc
commit ef2ed0f
Show file tree

Hide file tree

Showing 7 changed files with 419 additions and 71 deletions.
diff --git a/interface/package.json b/interface/package.json
@@ -20,7 +20,7 @@
     "lint": "eslint . --cache --fix"
   },
   "dependencies": {
-    "@alova/adapter-xhr": "^1.0.1",
+    "@alova/adapter-xhr": "^1.0.2",
     "@babel/core": "^7.23.6",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
@@ -30,10 +30,10 @@
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.10.4",
-    "@types/react": "^18.2.43",
-    "@types/react-dom": "^18.2.17",
+    "@types/react": "^18.2.45",
+    "@types/react-dom": "^18.2.18",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.16.0",
+    "alova": "^2.16.1",
     "async-validator": "^4.2.5",
     "history": "^5.3.0",
     "jwt-decode": "^4.0.0",
@@ -43,7 +43,7 @@
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
     "react-icons": "^4.12.0",
-    "react-router-dom": "^6.20.1",
+    "react-router-dom": "^6.21.0",
     "react-toastify": "^9.1.3",
     "sockette": "^2.0.6",
     "typesafe-i18n": "^5.26.2",
@@ -55,13 +55,13 @@
     "@typescript-eslint/eslint-plugin": "^6.14.0",
     "@typescript-eslint/parser": "^6.14.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-autofix": "^1.1.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "alpha",
     "eslint-plugin-react": "^7.33.2",
@@ -70,7 +70,7 @@
     "prettier": "^3.1.1",
     "rollup-plugin-visualizer": "^5.11.0",
     "terser": "^5.26.0",
-    "vite": "^5.0.8",
+    "vite": "^5.0.10",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^4.2.2"
   },

diff --git a/interface/src/SignIn.tsx b/interface/src/SignIn.tsx
@@ -1,6 +1,7 @@
 import ForwardIcon from '@mui/icons-material/Forward';
 import { Box, Paper, Typography, MenuItem, TextField, Button } from '@mui/material';
 import { useRequest } from 'alova';
+import SKflag from 'i18n/SK.svg';
 import { useContext, useState } from 'react';
 import { toast } from 'react-toastify';
 import { FeaturesContext } from './contexts/features';
@@ -150,6 +151,10 @@ const SignIn: FC = () => {
             <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
             &nbsp;TR
           </MenuItem>
+          <MenuItem key="sk" value="tr">
+            <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;SK
+          </MenuItem>
         </TextField>
 
         <Box display="flex" flexDirection="column" alignItems="center">

diff --git a/interface/src/components/layout/LayoutAuthMenu.tsx b/interface/src/components/layout/LayoutAuthMenu.tsx
@@ -12,13 +12,12 @@ import {
   MenuItem,
   TextField
 } from '@mui/material';
+import SKflag from 'i18n/SK.svg';
 import { useState, useContext } from 'react';
 import type { TypographyProps } from '@mui/material';
-
 import type { Locales } from 'i18n/i18n-types';
 import type { FC, ChangeEventHandler } from 'react';
 import { AuthenticatedContext } from 'contexts/authentication';
-
 import DEflag from 'i18n/DE.svg';
 import FRflag from 'i18n/FR.svg';
 import GBflag from 'i18n/GB.svg';
@@ -28,6 +27,7 @@ import NOflag from 'i18n/NO.svg';
 import PLflag from 'i18n/PL.svg';
 import SVflag from 'i18n/SV.svg';
 import TRflag from 'i18n/TR.svg';
+
 import { I18nContext } from 'i18n/i18n-react';
 import { loadLocaleAsync } from 'i18n/i18n-util.async';
 
@@ -110,6 +110,10 @@ const LayoutAuthMenu: FC = () => {
           <img src={TRflag} style={{ width: 16, verticalAlign: 'middle' }} />
           &nbsp;TR
         </MenuItem>
+        <MenuItem key="sk" value="tr">
+          <img src={SKflag} style={{ width: 16, verticalAlign: 'middle' }} />
+          &nbsp;SK
+        </MenuItem>
       </TextField>
 
       <IconButton

diff --git a/interface/src/i18n/SK.svg b/interface/src/i18n/SK.svg