diff --git a/package.json b/package.json index e60fbc5..4df3b4c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@coreui/coreui": "^2.1.9", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.0", "@coreui/icons": "0.3.0", - "@coreui/react": "~2.1.7", + "@coreui/react": "~2.5.0", "bootstrap": "^4.3.1", "chart.js": "^2.8.0", "classnames": "^2.2.6", @@ -30,8 +30,8 @@ "react-app-polyfill": "^1.0.1", "react-chartjs-2": "^2.7.6", "react-dom": "^16.8.6", - "react-router-config": "^4.4.0-beta.8", - "react-router-dom": "~4.3.1", + "react-router-config": "^5.0.0", + "react-router-dom": "^5.0.0", "react-test-renderer": "^16.8.6", "reactstrap": "^7.1.0", "simple-line-icons": "^2.4.1" diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js index 72f3a4a..843c91f 100644 --- a/src/containers/DefaultLayout/DefaultLayout.js +++ b/src/containers/DefaultLayout/DefaultLayout.js @@ -1,10 +1,10 @@ import React, { Component, Suspense } from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; +import * as router from 'react-router-dom'; import { Container } from 'reactstrap'; import { AppAside, - AppBreadcrumb, AppFooter, AppHeader, AppSidebar, @@ -12,7 +12,8 @@ import { AppSidebarForm, AppSidebarHeader, AppSidebarMinimizer, - AppSidebarNav, + AppBreadcrumb2 as AppBreadcrumb, + AppSidebarNav2 as AppSidebarNav, } from '@coreui/react'; // sidebar nav config import navigation from '../../_nav'; @@ -45,13 +46,13 @@ class DefaultLayout extends Component { - +
- +