aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src')
-rw-r--r--FrontEnd/src/@types/i18next.d.ts.draft (renamed from FrontEnd/src/i18next.d.ts)7
-rw-r--r--FrontEnd/src/@types/vite-env.d.ts (renamed from FrontEnd/src/vite-env.d.ts)0
-rw-r--r--FrontEnd/src/App.tsx4
-rw-r--r--FrontEnd/src/views/admin/UserAdmin.tsx2
-rw-r--r--FrontEnd/src/views/common/ImageCropper.tsx2
5 files changed, 6 insertions, 9 deletions
diff --git a/FrontEnd/src/i18next.d.ts b/FrontEnd/src/@types/i18next.d.ts.draft
index 761b22f3..46ff155e 100644
--- a/FrontEnd/src/i18next.d.ts
+++ b/FrontEnd/src/@types/i18next.d.ts.draft
@@ -1,10 +1,9 @@
// import the original type declarations
-import "react-i18next";
+import "i18next";
// import all namespaces (for the default language, only)
-import admin from "./locales/en/admin.json";
-import translation from "./locales/en/translation.json";
+import admin from "../locales/en/admin.json";
+import translation from "../locales/en/translation.json";
-// react-i18next versions higher than 11.11.0
declare module "i18next" {
// and extend them!
interface CustomTypeOptions {
diff --git a/FrontEnd/src/vite-env.d.ts b/FrontEnd/src/@types/vite-env.d.ts
index 11f02fe2..11f02fe2 100644
--- a/FrontEnd/src/vite-env.d.ts
+++ b/FrontEnd/src/@types/vite-env.d.ts
diff --git a/FrontEnd/src/App.tsx b/FrontEnd/src/App.tsx
index 78e8a146..18f6cd97 100644
--- a/FrontEnd/src/App.tsx
+++ b/FrontEnd/src/App.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from "react";
+import React from "react";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import AppBar from "./views/common/AppBar";
@@ -20,7 +20,7 @@ const NoMatch: React.FC = () => {
return <div>Ah-oh, 404!</div>;
};
-function App(): ReactElement | null {
+function App(): JSX.Element {
const user = useUser();
return (
diff --git a/FrontEnd/src/views/admin/UserAdmin.tsx b/FrontEnd/src/views/admin/UserAdmin.tsx
index e85281e3..fbcc28ba 100644
--- a/FrontEnd/src/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/views/admin/UserAdmin.tsx
@@ -58,7 +58,7 @@ const UserDeleteDialog: React.FC<{
title="admin:user.dialog.delete.title"
themeColor="danger"
inputPrompt={() => (
- <Trans i18nKey="admin:user.dialog.delete.prompt">
+ <Trans i18nKey="user.dialog.delete.prompt" ns="admin">
0<UsernameLabel>{user.username}</UsernameLabel>2
</Trans>
)}
diff --git a/FrontEnd/src/views/common/ImageCropper.tsx b/FrontEnd/src/views/common/ImageCropper.tsx
index be44200a..4262e18f 100644
--- a/FrontEnd/src/views/common/ImageCropper.tsx
+++ b/FrontEnd/src/views/common/ImageCropper.tsx
@@ -233,7 +233,6 @@ const ImageCropper = (props: ImageCropperProps): React.ReactElement => {
<div className="image-cropper-mask-container">
<div
className="image-cropper-mask"
- touch-action="none"
style={{
left: toPercentage(c.left * 100),
top: toPercentage(c.top * 100),
@@ -247,7 +246,6 @@ const ImageCropper = (props: ImageCropperProps): React.ReactElement => {
</div>
<div
className="image-cropper-handler"
- touch-action="none"
style={{
left: `calc(${(c.left + c.width) * 100}% - 15px)`,
top: `calc(${(c.top + c.height) * 100}% - 15px)`,