diff --git a/CHANGELOG.md b/CHANGELOG.md index 5110db2..cb82917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [react](./REACT.md) version `changelog` +##### `v1.0.11` +- refactor(Breadcrumb): fix for dynamic url like `/resource/:id` +- feat: Users/User Breadcrumb example with `/users/:id` + ##### `v1.0.10` - refactor: `` - refactor: `` diff --git a/React_Full_Project/package.json b/React_Full_Project/package.json index 4f2255e..2f1c5af 100644 --- a/React_Full_Project/package.json +++ b/React_Full_Project/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/react", - "version": "1.0.10", + "version": "1.0.11", "description": "Open Source Bootstrap Admin Template", "author": "Łukasz Holeczek", "homepage": "http://coreui.io", @@ -20,7 +20,7 @@ "file-loader": "1.1.6", "html-loader": "0.5.5", "html-webpack-plugin": "2.30.1", - "node-sass": "4.7.2", + "node-sass": "^4.9.0", "rimraf": "2.6.2", "sass-loader": "6.0.6", "source-list-map": "2.0.0", @@ -32,7 +32,8 @@ }, "dependencies": { "bootstrap": "4.0.0", - "chart.js": "2.7.1", + "chart.js": "^2.7.2", + "core-js": "^2.5.7", "flag-icon-css": "2.9.0", "font-awesome": "4.7.0", "history": "4.7.2", diff --git a/React_Full_Project/src/components/Breadcrumb/Breadcrumb.js b/React_Full_Project/src/components/Breadcrumb/Breadcrumb.js index b4f5db9..395b350 100644 --- a/React_Full_Project/src/components/Breadcrumb/Breadcrumb.js +++ b/React_Full_Project/src/components/Breadcrumb/Breadcrumb.js @@ -1,9 +1,19 @@ import React from 'react'; -import {Route, Link} from 'react-router-dom'; +import {Route, Link, matchPath} from 'react-router-dom'; import {Breadcrumb, BreadcrumbItem} from 'reactstrap'; import routes from '../../routes'; -const findRouteName = url => routes[url]; +const findRouteName = (url) => { + let found; + for (let path of Object.entries(routes)) { + found = matchPath(url, {path, exact: true}); + + if (found) { + return routes[found.path[0]]; + } + } + return null; +}; const getPaths = (pathname) => { const paths = ['/']; diff --git a/React_Full_Project/src/components/Header/Header.js b/React_Full_Project/src/components/Header/Header.js index 1e69eb5..12575bf 100644 --- a/React_Full_Project/src/components/Header/Header.js +++ b/React_Full_Project/src/components/Header/Header.js @@ -48,10 +48,10 @@ class Header extends Component {