Skip to content

Commit

Permalink
ship: v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xidedix committed Nov 7, 2018
1 parent 7b358c4 commit 4e5d693
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 39 deletions.
31 changes: 30 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog

##### `v2.1.0`
- feat(SidebarNav): navLink `attributes` - optional JS object with valid JS API naming:
- valid attributes: `rel`, `target`, `hidden`, `disabled`, etc...
- starting with `@coreui/coreui`, `@coreui/react` version `2.1.0` and up
- closes #106
- item example(`./src/_nav.js`):
```js
{
name: 'Disabled',
url: '/disabled',
icon: 'icon-ban',
attributes: { disabled: true },
},
{
name: 'Try CoreUI PRO',
url: 'https://coreui.io/pro/react/',
icon: 'cui-layers icons',
variant: 'danger',
attributes: { target: '_blank', rel: "noopener" },
},
```
- fix(Cards): `card-header-actions` added to `CardHeader` for `rtl` support
- feat(Dashboard): new `Suspense` example with Widget03
- chore: update `@coreui/coreui` to `2.1.0`
- chore: update `@coreui/react` to `2.1.0`
- chore: update `node-sass` to `4.10.0`
- chore: update `react` to `16.6.1`
- chore: update `react-dom` to `16.6.1`
- chore: update `react-test-renderer` to `16.6.1`

##### `v2.0.14`
- chore: update `@coreui/coreui` to `2.0.25`
- chore: update `chart.js` to `2.7.3`
Expand All @@ -11,7 +41,6 @@
- chore: update `react-test-renderer` to `16.6.0`
- chore: update `react-scripts` to `2.1.1`


##### `v2.0.13`
- refactor: migration to [Create React App 2.0](https://reactjs.org/blog/2018/10/01/create-react-app-v2.html) cleanup
- cleanup `package.json` scripts
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-react-admin-template",
"version": "2.0.14",
"version": "2.1.0",
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
"author": "Łukasz Holeczek",
"homepage": "https://coreui.io",
Expand Down
57 changes: 20 additions & 37 deletions src/views/Dashboard/Dashboard.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component } from 'react';
import React, { Component, lazy, Suspense } from 'react';
import { Bar, Line } from 'react-chartjs-2';
import {
Badge,
Expand All @@ -20,10 +20,13 @@ import {
Row,
Table,
} from 'reactstrap';
import Widget03 from '../../views/Widgets/Widget03'
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips';
import { getStyle, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'

// import Widget03 from '../../views/Widgets/Widget03'
const Widget03 = lazy(() => import('../../views/Widgets/Widget03'));
const Loading = () => <div>Loading...</div>

const brandPrimary = getStyle('--primary')
const brandSuccess = getStyle('--success')
const brandInfo = getStyle('--info')
Expand Down Expand Up @@ -637,53 +640,33 @@ class Dashboard extends Component {

<Row>
<Col xs="6" sm="6" lg="3">
<Widget03 dataBox={() => ({ variant: 'facebook', friends: '89k', feeds: '459' })} >
<div className="chart-wrapper">
<Line data={makeSocialBoxData(0)} options={socialChartOpts} height={90} />
</div>
</Widget03>
<Suspense fallback={Loading()}>
<Widget03 dataBox={() => ({ variant: 'facebook', friends: '89k', feeds: '459' })} >
<div className="chart-wrapper">
<Line data={makeSocialBoxData(0)} options={socialChartOpts} height={90} />
</div>
</Widget03>
</Suspense>
</Col>

<Col xs="6" sm="6" lg="3">
<div className="brand-card">
<div className="brand-card-header bg-twitter">
<i className="fa fa-twitter"></i>
<Suspense fallback={Loading()}>
<Widget03 dataBox={() => ({ variant: 'twitter', followers: '973k', tweets: '1.792' })} >
<div className="chart-wrapper">
<Line data={makeSocialBoxData(1)} options={socialChartOpts} height={90} />
</div>
</div>
<div className="brand-card-body">
<div>
<div className="text-value">973k</div>
<div className="text-uppercase text-muted small">followers</div>
</div>
<div>
<div className="text-value">1.792</div>
<div className="text-uppercase text-muted small">tweets</div>
</div>
</div>
</div>
</Widget03>
</Suspense>
</Col>

<Col xs="6" sm="6" lg="3">
<div className="brand-card">
<div className="brand-card-header bg-linkedin">
<i className="fa fa-linkedin"></i>
<Suspense fallback={Loading()}>
<Widget03 dataBox={() => ({ variant: 'linkedin', contacts: '500+', feeds: '292' })} >
<div className="chart-wrapper">
<Line data={makeSocialBoxData(2)} options={socialChartOpts} height={90} />
</div>
</div>
<div className="brand-card-body">
<div>
<div className="text-value">500+</div>
<div className="text-uppercase text-muted small">contacts</div>
</div>
<div>
<div className="text-value">292</div>
<div className="text-uppercase text-muted small">feeds</div>
</div>
</div>
</div>
</Widget03>
</Suspense>
</Col>

<Col xs="6" sm="6" lg="3">
Expand Down

0 comments on commit 4e5d693

Please sign in to comment.