Skip to content

v2.5.0 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xidedix merged 5 commits into from
May 15, 2019
Merged

v2.5.0 #74

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c704593
chore: dependencies update
xidedix May 15, 2019
416fef2
refactor(SidebarNav): rename options prop for PerfectScrollbar
xidedix May 15, 2019
9604939
feat(Breadcrumb2, SidebarNav2): mandatory router prop
xidedix May 15, 2019
f2dd6c0
refactor: demo update
xidedix May 15, 2019
6a2004e
Ship: v2.5.0
xidedix May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: demo update
  • Loading branch information
@xidedix
xidedix committed May 15, 2019
commit f2dd6c0fc0cf4ee0d71c5cb41ad2049f8d1a3f45
12 changes: 7 additions & 5 deletions demo/src/containers/DefaultLayout/DefaultLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, { Component } from 'react';
import { Redirect, Route, Switch } from 'react-router-dom';
import * as router from 'react-router-dom';
import { Container, Nav, NavItem, NavLink, Badge, DropdownToggle, DropdownMenu } from 'reactstrap';

import {
AppAside,
AppAsideToggler,
AppBreadcrumb,
AppBreadcrumb2 as AppBreadcrumb,
AppFooter,
AppHeader,
AppHeaderDropdown,
Expand All @@ -15,7 +16,7 @@ import {
AppSidebarForm,
AppSidebarHeader,
AppSidebarMinimizer,
AppSidebarNav,
AppSidebarNav2 as AppSidebarNav,
AppSidebarToggler,
} from '../../../../src';
// sidebar nav config
Expand Down Expand Up @@ -64,13 +65,14 @@ class DefaultLayout extends Component {
<AppSidebar fixed display="lg">
<AppSidebarHeader />
<AppSidebarForm />
<AppSidebarNav navConfig={navigation} {...this.props} />
{/*<AppSidebarNav navConfig={navigation} {...this.props} />*/}
<AppSidebarNav navConfig={navigation} {...this.props} router={router}/>
<AppSidebarFooter />
<AppSidebarMinimizer />
</AppSidebar>
<main className="main">
<AppBreadcrumb appRoutes={routes}>
</AppBreadcrumb>
{/*<AppBreadcrumb appRoutes={routes}/>*/}
<AppBreadcrumb appRoutes={routes} router={router}/>
<Container fluid>
<Switch>
{routes.map((route, idx) => {
Expand Down