{
// global
let layoutState = useLayoutState();
const classes = useStyles();
- const { path } = useRouteMatch();
+
+ const match = useMatch('/documentation');
+ const path = match?.pattern.path || '';
+
return (
@@ -87,9 +89,9 @@ const Documentation = (props) => {
})}
-
+
-
+
@@ -106,10 +108,10 @@ const Documentation = (props) => {
-
+
);
};
-export default withRouter(Documentation);
+export default Documentation;
diff --git a/src/components/Documentation/components/Header/Header.js b/src/components/Documentation/components/Header/Header.js
index 5fc8c4f4..1d9a7165 100644
--- a/src/components/Documentation/components/Header/Header.js
+++ b/src/components/Documentation/components/Header/Header.js
@@ -1,6 +1,5 @@
import React, { useEffect, useState } from 'react';
import useStyles from './styles';
-import { withRouter } from 'react-router-dom';
// Material-UI core components
import { AppBar, Toolbar, IconButton, Box, Button } from '@mui/material';
@@ -139,4 +138,4 @@ const Header = (props) => {
);
};
-export default withRouter(Header);
+export default Header;
diff --git a/src/components/Documentation/pages/buttons/Buttons.js b/src/components/Documentation/pages/buttons/Buttons.js
index d1f64bc6..e49bee0d 100644
--- a/src/components/Documentation/pages/buttons/Buttons.js
+++ b/src/components/Documentation/pages/buttons/Buttons.js
@@ -1,6 +1,5 @@
import React from 'react';
import { Box, Grid } from '@mui/material';
-import { withRouter } from 'react-router-dom';
//components
import Widget from '../../../Widget';
@@ -118,4 +117,4 @@ const Pages = (props) => {
);
};
-export default withRouter(Pages);
+export default Pages;
diff --git a/src/components/Documentation/pages/pages/Pages.js b/src/components/Documentation/pages/pages/Pages.js
index e872fa2d..a434a9da 100644
--- a/src/components/Documentation/pages/pages/Pages.js
+++ b/src/components/Documentation/pages/pages/Pages.js
@@ -1,6 +1,5 @@
import React from "react";
import { Grid } from "@material-ui/core";
-import { withRouter } from "react-router-dom";
//components
import Widget from "../../../Widget";
@@ -36,7 +35,7 @@ const Pages = props => {
isAuthenticated ? (
React.createElement(component, props)
) : (
- {
{...rest}
render={props =>
isAuthenticated ? (
- {
);
};
-export default withRouter(Pages);
+export default Pages;
diff --git a/src/components/Documentation/pages/sidebar/Sidebar.js b/src/components/Documentation/pages/sidebar/Sidebar.js
index 090ab25d..443623f1 100644
--- a/src/components/Documentation/pages/sidebar/Sidebar.js
+++ b/src/components/Documentation/pages/sidebar/Sidebar.js
@@ -1,6 +1,5 @@
import React from 'react';
import { Grid } from '@mui/material';
-import { withRouter } from 'react-router-dom';
//components
import Widget from '../../../Widget';
@@ -39,4 +38,4 @@ const Pages = (props) => {
);
};
-export default withRouter(Pages);
+export default Pages;
diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js
index f573b201..d451e8fa 100644
--- a/src/components/Layout/Layout.js
+++ b/src/components/Layout/Layout.js
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
-import { Route, Switch, withRouter } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
import classnames from 'classnames';
import SettingsIcon from '@mui/icons-material/Settings';
@@ -108,7 +108,7 @@ function Layout(props) {
>
-
+
@@ -177,8 +177,6 @@ function Layout(props) {
- />
-
-
+
{
- const history = useHistory();
+ const navigate = useNavigate();
const [anchorEl, setAnchorEl] = React.useState(null);
const open = Boolean(anchorEl);
@@ -36,7 +36,7 @@ const Actions = ({ classes, id, openModal, entity }) => {