DefaultGenericErrorPage from plain js to typescript

VAuthenticator · Sep 2, 2023 · b02522f · b02522f
1 parent b152103
commit b02522f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/src/main/frontend/app/errors/DefaultErrorPage.js b/src/main/frontend/app/errors/DefaultErrorPage.js
diff --git a/src/main/frontend/app/errors/DefaultGenericErrorPage.tsx b/src/main/frontend/app/errors/DefaultGenericErrorPage.tsx
@@ -0,0 +1,28 @@
+import React from "react";
+
+import {ThemeProvider, Typography} from "@mui/material";
+import theme from "../component/styles";
+import Template from "../component/Template";
+import {SentimentVeryDissatisfied} from "@mui/icons-material";
+
+interface DefaultGenericErrorPageProps {
+    messages: string
+}
+interface ErrorMessage {
+    defaultMessage: string
+}
+
+const DefaultGenericErrorPage: React.FC<DefaultGenericErrorPageProps> = ({messages}) => {
+    let errors : ErrorMessage  = JSON.parse(messages)
+    return <ThemeProvider theme={theme}>
+        <Template maxWidth="sm">
+            <Typography variant="h3" component="h3">
+                <SentimentVeryDissatisfied fontSize="large"/> {errors.defaultMessage}
+            </Typography>
+
+        </Template>
+    </ThemeProvider>
+
+}
+
+export default DefaultGenericErrorPage
diff --git a/src/main/frontend/package.json b/src/main/frontend/package.json
@@ -2,12 +2,7 @@
   "name": "vautehenticator-asset",
   "version": "0.7",
   "description": "VAuthenticator UI Asset library",
-  "babel": {
-    "presets": [
-      "@babel/react",
-      "@babel/env"
-    ]
-  },
+
   "scripts": {
     "build": "webpack --config webpack.config.js --mode=development",
     "production-build": "webpack --config webpack.config.js --mode=production",
@@ -28,6 +23,9 @@
     "webpack-cli": "5.1.4"
   },
   "dependencies": {
+    "@types/node": "^20.5.8",
+    "@types/react": "^18.2.21",
+    "@types/react-dom": "^18.2.7",
     "typescript": "^5.2.2",
     "@date-io/moment": "^2.17.0",
     "@emotion/react": "^11.11.1",

diff --git a/src/main/frontend/webpack.config.js b/src/main/frontend/webpack.config.js
@@ -4,7 +4,7 @@ const BUID_DIR = path.resolve(__dirname + "/dist");
 
 module.exports = {
     entry: {
-        "default_error": path.resolve(__dirname, './app/errors/DefaultErrorPage.js'),
+        "default_error": path.resolve(__dirname, './app/errors/DefaultGenericErrorPage.tsx'),
         "404_error": path.resolve(__dirname, './app/errors/400ErrorPage.js'),
         "400_error": path.resolve(__dirname, './app/errors/404ErrorPage.js'),
         "500_error": path.resolve(__dirname, './app/errors/500ErrorPage.js'),
@@ -34,7 +34,7 @@ module.exports = {
                 exclude: /node_modules$/,
             },
             {
-                test: path.join(__dirname, "."),
+                test: /\.js$/,
                 exclude: path.resolve(__dirname, "node_modules"),
                 use: {
                     loader: "babel-loader",