more fixes

Author: centrodph

src/App.tsx

@@ -5,9 +5,8 @@ import { WithWidth } from "@material-ui/core/withWidth";
 import { makeStyles } from "@material-ui/styles";
 import * as React from "react";
 import { connect } from "react-redux";
-import { Route, RouteComponentProps, Router } from "react-router-dom";
+import { Route, Router } from "react-router-dom";
 // config
-import { history } from "./redux/configureStore";
 import { RootState } from "./redux/rootReducer";
 import withRoot from "./withRoot";
 // hoc
@@ -28,7 +27,7 @@ function Routes() {
 	);
 }
 
-interface Props extends RouteComponentProps<void>, WithWidth { }
+interface Props extends WithWidth { }
 
 function App(props?: Props) {
 	const classes = useStyles();
@@ -37,7 +36,7 @@ function App(props?: Props) {
 	}
 
 	return (
-		<Router history={history}>
+		<Router>
 			<div className={classes.root}>
 				<div className={classes.appFrame}>
 					<Routes />

src/pages/Login/Login.tsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
-import { RouteComponentProps } from "react-router-dom";
 
 // material ui
 import Avatar from "@material-ui/core/Avatar";
@@ -20,6 +19,7 @@ import * as LoginActions from "../../redux/authentication/authenticationActions"
 // elements
 import FieldUsername from 'elements/FieldUsername/FieldUsername';
 import FieldPassWord from 'elements/FieldPassword/FieldPassword';
+import { useNavigate } from "react-router-dom";
 
 const styles = (theme: Theme) => createStyles({
   main: {
@@ -54,18 +54,19 @@ const styles = (theme: Theme) => createStyles({
 });
 
 
-interface Props extends RouteComponentProps<any> {
+interface Props {
   classes: any;
   todoList: Todo[];
   actions: typeof LoginActions;
   token: string | null;
 }
 
 function Login(props: Props) {
-  console.log(props);
   const { classes } = props;
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
+  const navigate = useNavigate();
+
 
   const handleSubmit = (event: any) => {
     event.preventDefault();
@@ -76,7 +77,7 @@ function Login(props: Props) {
   };
   useEffect(() => {
     if(props.token) {
-      props.history.push('/listing');
+      navigate('/listing');
     }
   });
   return (