From db15382363419ae572f5ee2b7fef37013f665970 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 27 Oct 2022 20:47:31 +0800
Subject: Fix all errors so far.

---
 FrontEnd/src/@types/i18next.d.ts.draft     | 18 ++++++++++++++++++
 FrontEnd/src/@types/vite-env.d.ts          |  1 +
 FrontEnd/src/App.tsx                       |  4 ++--
 FrontEnd/src/i18next.d.ts                  | 19 -------------------
 FrontEnd/src/views/admin/UserAdmin.tsx     |  2 +-
 FrontEnd/src/views/common/ImageCropper.tsx |  2 --
 FrontEnd/src/vite-env.d.ts                 |  1 -
 7 files changed, 22 insertions(+), 25 deletions(-)
 create mode 100644 FrontEnd/src/@types/i18next.d.ts.draft
 create mode 100644 FrontEnd/src/@types/vite-env.d.ts
 delete mode 100644 FrontEnd/src/i18next.d.ts
 delete mode 100644 FrontEnd/src/vite-env.d.ts

(limited to 'FrontEnd/src')

diff --git a/FrontEnd/src/@types/i18next.d.ts.draft b/FrontEnd/src/@types/i18next.d.ts.draft
new file mode 100644
index 00000000..46ff155e
--- /dev/null
+++ b/FrontEnd/src/@types/i18next.d.ts.draft
@@ -0,0 +1,18 @@
+// import the original type declarations
+import "i18next";
+// import all namespaces (for the default language, only)
+import admin from "../locales/en/admin.json";
+import translation from "../locales/en/translation.json";
+
+declare module "i18next" {
+  // and extend them!
+  interface CustomTypeOptions {
+    // custom namespace type if you changed it
+    defaultNS: "translation";
+    // custom resources type
+    resources: {
+      admin: typeof admin;
+      translation: typeof translation;
+    };
+  }
+}
diff --git a/FrontEnd/src/@types/vite-env.d.ts b/FrontEnd/src/@types/vite-env.d.ts
new file mode 100644
index 00000000..11f02fe2
--- /dev/null
+++ b/FrontEnd/src/@types/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
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/i18next.d.ts b/FrontEnd/src/i18next.d.ts
deleted file mode 100644
index 761b22f3..00000000
--- a/FrontEnd/src/i18next.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// import the original type declarations
-import "react-i18next";
-// import all namespaces (for the default language, only)
-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 {
-    // custom namespace type if you changed it
-    defaultNS: "translation";
-    // custom resources type
-    resources: {
-      admin: typeof admin;
-      translation: typeof translation;
-    };
-  }
-}
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)`,
diff --git a/FrontEnd/src/vite-env.d.ts b/FrontEnd/src/vite-env.d.ts
deleted file mode 100644
index 11f02fe2..00000000
--- a/FrontEnd/src/vite-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="vite/client" />
-- 
cgit v1.2.3