fix(fe): admin dashboard now shows without error

petio-team · Mar 31, 2024 · 5a596d5 · 5a596d5
1 parent 1e381f4
commit 5a596d5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/pkg/frontend/src/App.js b/pkg/frontend/src/App.js
@@ -34,30 +34,31 @@ const popupCenter = (url, title, w, h) => {
   var width = window.innerWidth
     ? window.innerWidth
     : document.documentElement.clientWidth
-    ? document.documentElement.clientWidth
-    : screen.width;
+      ? document.documentElement.clientWidth
+      : window.screen.width;
   var height = window.innerHeight
     ? window.innerHeight
     : document.documentElement.clientHeight
-    ? document.documentElement.clientHeight
-    : screen.height;
+      ? document.documentElement.clientHeight
+      : window.screen.height;
 
   var left = width / 2 - w / 2 + dualScreenLeft;
   var top = height / 2 - h / 2 + dualScreenTop;
   var newWindow = window.open(
     url,
     title,
     'scrollbars=yes, width=' +
-      w +
-      ', height=' +
-      h +
-      ', top=' +
-      top +
-      ', left=' +
-      left,
+    w +
+    ', height=' +
+    h +
+    ', top=' +
+    top +
+    ', left=' +
+    left,
   );
-
-  if (window.focus) newWindow.focus();
+  if (newWindow) {
+    newWindow.focus();
+  }
   return newWindow;
 };
 
@@ -98,7 +99,7 @@ class App extends React.Component {
 
   msg(
     data = {
-      message: String,
+      message: '',
       type: 'info',
     },
   ) {
@@ -136,6 +137,7 @@ class App extends React.Component {
     if (/^\s/.test(username)) {
       this.msg({
         type: 'error',
+        // @ts-ignore
         message:
           'The username you entered contains a space before! Please remove it',
       });
@@ -144,6 +146,7 @@ class App extends React.Component {
     if (/^\s/.test(password)) {
       this.msg({
         type: 'error',
+        // @ts-ignore
         message:
           'The password you entered contains a space before! Please remove it',
       });
@@ -336,9 +339,8 @@ class App extends React.Component {
               return (
                 <div
                   key={`${msg.timestamp}__${i}`}
-                  className={`push-msg--item ${
-                    msg.type !== 'info' ? msg.type : ''
-                  }`}
+                  className={`push-msg--item ${msg.type !== 'info' ? msg.type : ''
+                    }`}
                 >
                   {msg.message}
                 </div>
@@ -363,7 +365,7 @@ class App extends React.Component {
                     onChange={this.inputChange}
                     autoComplete="username"
                   />
-                  {this.state.login_type === 1 ? (
+                  {this.state.login_type === true ? (
                     <>
                       <p style={{ marginBottom: '5px' }}>Password</p>
                       <input
@@ -435,9 +437,8 @@ class App extends React.Component {
                 return (
                   <div
                     key={`msg__${msg.timestamp}__${i}`}
-                    className={`push-msg--item ${
-                      msg.type !== 'info' ? msg.type : ''
-                    }`}
+                    className={`push-msg--item ${msg.type !== 'info' ? msg.type : ''
+                      }`}
                   >
                     {msg.message}
                   </div>

diff --git a/pkg/frontend/src/pages/admin/index.js b/pkg/frontend/src/pages/admin/index.js
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { connect } from 'react-redux';
-import { Route, Switch } from 'react-router';
-import { Link } from 'react-router-dom';
+import { Link, Route, Switch } from 'react-router-dom';
+
 
 import NotFound from '../404';
 import { Login } from '../../components/login';

diff --git a/pkg/frontend/src/pages/admin/settings.js b/pkg/frontend/src/pages/admin/settings.js
@@ -1,4 +1,5 @@
-import { Route, Switch, useHistory } from 'react-router';
+import { useHistory } from 'react-router';
+import { Route, Switch } from 'react-router-dom';
 
 import AdminSettingsSidebar from '../../components/adminSettingsSidebar';
 import Meta from '../../components/meta';