From 987c0474278f9d2756a1c9c43e1d0d96f6a2d4be Mon Sep 17 00:00:00 2001 From: sergeyt Date: Sun, 24 Mar 2019 18:31:42 +0700 Subject: [PATCH 1/8] fix circular dependency --- src/routes.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/routes.js b/src/routes.js index e45082b..3733ac8 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,5 +1,4 @@ import React from 'react'; -import DefaultLayout from './containers/DefaultLayout'; const Breadcrumbs = React.lazy(() => import('./views/Base/Breadcrumbs')); const Cards = React.lazy(() => import('./views/Base/Cards')); @@ -39,7 +38,6 @@ const User = React.lazy(() => import('./views/Users/User')); // https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config const routes = [ - { path: '/', exact: true, name: 'Home', component: DefaultLayout }, { path: '/dashboard', name: 'Dashboard', component: Dashboard }, { path: '/theme', exact: true, name: 'Theme', component: Colors }, { path: '/theme/colors', name: 'Colors', component: Colors }, From 691d0cd9b5c986e7cb0cf3e586d13d1e4f029703 Mon Sep 17 00:00:00 2001 From: sergeyt Date: Sun, 24 Mar 2019 18:41:07 +0700 Subject: [PATCH 2/8] remove redundant react-loadable --- package.json | 1 - src/App.js | 45 ++++++++++++++------------------------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 11c1dbe..4337060 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "react-app-polyfill": "^0.2.1", "react-chartjs-2": "^2.7.4", "react-dom": "^16.8.4", - "react-loadable": "^5.5.0", "react-router-config": "^4.4.0-beta.6", "react-router-dom": "^4.3.1", "react-test-renderer": "^16.8.4", diff --git a/src/App.js b/src/App.js index 9744ed1..47e6874 100644 --- a/src/App.js +++ b/src/App.js @@ -1,50 +1,33 @@ import React, { Component } from 'react'; import { HashRouter, Route, Switch } from 'react-router-dom'; // import { renderRoutes } from 'react-router-config'; -import Loadable from 'react-loadable'; import './App.scss'; const loading = () =>
Loading...
; // Containers -const DefaultLayout = Loadable({ - loader: () => import('./containers/DefaultLayout'), - loading -}); +const DefaultLayout = React.lazy(() => import('./containers/DefaultLayout')); // Pages -const Login = Loadable({ - loader: () => import('./views/Pages/Login'), - loading -}); - -const Register = Loadable({ - loader: () => import('./views/Pages/Register'), - loading -}); - -const Page404 = Loadable({ - loader: () => import('./views/Pages/Page404'), - loading -}); - -const Page500 = Loadable({ - loader: () => import('./views/Pages/Page500'), - loading -}); +const Login = React.lazy(() => import('./views/Pages/Login')); +const Register = React.lazy(() => import('./views/Pages/Register')); +const Page404 = React.lazy(() => import('./views/Pages/Page404')); +const Page500 = React.lazy(() => import('./views/Pages/Page500')); class App extends Component { render() { return ( - - - - - - - + + + + + + + + + ); } From ded4437ae10cc03eb75c5eca89c266c3ce2dc3a5 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 25 Mar 2019 14:27:54 +0100 Subject: [PATCH 3/8] refactor(App): change to render in Route --- src/App.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App.js b/src/App.js index 47e6874..0a55f9d 100644 --- a/src/App.js +++ b/src/App.js @@ -21,11 +21,11 @@ class App extends Component { - - - - - + } /> + } /> + } /> + } /> + } /> From 988b2405666a5d8b523bf67b7abf3fea1ce20927 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 25 Mar 2019 14:29:54 +0100 Subject: [PATCH 4/8] fix(routes): add Home to routes - breadcrumb issue --- src/routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes.js b/src/routes.js index 3733ac8..ec26cd6 100644 --- a/src/routes.js +++ b/src/routes.js @@ -38,6 +38,7 @@ const User = React.lazy(() => import('./views/Users/User')); // https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config const routes = [ + { path: '/', exact: true, name: 'Home' }, { path: '/dashboard', name: 'Dashboard', component: Dashboard }, { path: '/theme', exact: true, name: 'Theme', component: Colors }, { path: '/theme/colors', name: 'Colors', component: Colors }, From 7ad00e6a335241ea554496b0d30bbe1b7646be58 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 25 Mar 2019 15:32:11 +0100 Subject: [PATCH 5/8] refactor(DefaultHeader): move to ReactRouter NavLink --- src/containers/DefaultLayout/DefaultHeader.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/containers/DefaultLayout/DefaultHeader.js b/src/containers/DefaultLayout/DefaultHeader.js index 90e3419..43f3754 100644 --- a/src/containers/DefaultLayout/DefaultHeader.js +++ b/src/containers/DefaultLayout/DefaultHeader.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { Link } from 'react-router-dom'; -import { Badge, DropdownItem, DropdownMenu, DropdownToggle, Nav, NavItem, NavLink } from 'reactstrap'; +import { Link, NavLink } from 'react-router-dom'; +import { Badge, DropdownItem, DropdownMenu, DropdownToggle, Nav, NavItem } from 'reactstrap'; import PropTypes from 'prop-types'; import { AppAsideToggler, AppHeaderDropdown, AppNavbarBrand, AppSidebarToggler } from '@coreui/react'; @@ -30,24 +30,24 @@ class DefaultHeader extends Component {