Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.

Commit 6c2cb10

Browse files
author
booleanhunter
committed
Created component for area-chart
1 parent cd9b701 commit 6c2cb10

9 files changed

Lines changed: 95 additions & 46 deletions

File tree

reactjs-adminlte/public/dist/js/chartVendors.bundle.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reactjs-adminlte/public/dist/js/dashboardV1.bundle.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reactjs-adminlte/public/dist/js/generalUIElements.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reactjs-adminlte/public/dist/js/timeline.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reactjs-adminlte/public/dist/js/vendors.js

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reactjs-adminlte/public/dist/js/widgets.bundle.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
define(
2+
[
3+
'react',
4+
'jquery',
5+
'raphael',
6+
'morris'
7+
],
8+
function(React, $, Raphael, Morris){
9+
var AreaChart = React.createClass({
10+
getDefaultProps: function() {
11+
return {
12+
id: 'area-chart-1',
13+
data: [
14+
{y: '2011 Q1', item1: 2666, item2: 2666},
15+
{y: '2011 Q2', item1: 2778, item2: 2294}
16+
],
17+
xkey: 'y',
18+
ykeys: ['item1', 'item2'],
19+
labels: ['Item 1', 'Item 2'],
20+
lineColors: ['#a0d0e0', '#3c8dbc']
21+
}
22+
},
23+
componentDidMount: function(){
24+
var area = new Morris.Area({
25+
element: this.props.id,
26+
resize: true,
27+
data: this.props.data,
28+
xkey: this.props.xkey,
29+
ykeys: this.props.ykeys,
30+
labels: this.props.labels,
31+
lineColors: this.props.lineColors,
32+
hideHover: 'auto'
33+
});
34+
},
35+
render: function(){
36+
var style = {
37+
position: 'relative',
38+
height: '300px'
39+
};
40+
41+
return (
42+
<div className="chart tab-pane" id={this.props.id} style={style}>
43+
{this.props.children}
44+
</div>
45+
)
46+
}
47+
})
48+
49+
return AreaChart;
50+
}
51+
)

reactjs-adminlte/public/src/dashboardV1/js/components/containers/container-one.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ define(
2121
</ul>
2222
<div className="tab-content no-padding">
2323
{/* Morris chart - Sales */}
24-
<div className="chart tab-pane" id="revenue-chart" style={style}></div>
2524
{this.props.children}
2625
</div>
2726
</div>

reactjs-adminlte/public/src/dashboardV1/js/components/dashboard.js

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ define(
88
'./navigation-menu',
99
'./control-panel',
1010
'./charts/donut-chart',
11+
'./charts/area-chart',
1112
'./containers/container-one',
1213
'./containers/container-two',
1314
'./containers/container-three',
@@ -18,7 +19,7 @@ define(
1819
'./controls-menu',
1920
'./stat-tile'
2021
],
21-
function(React, $, Raphael, Morris, HeaderBar, NavigationMenu, ControlPanel, DonutChart, ContainerOne, ContainerTwo, ContainerThree, ContainerFour,ContainerFive,ContainerSix,ContainerSeven,ControlsMenu,StatTile){
22+
function(React, $, Raphael, Morris, HeaderBar, NavigationMenu, ControlPanel, DonutChart, AreaChart, ContainerOne, ContainerTwo, ContainerThree, ContainerFour,ContainerFive,ContainerSix,ContainerSeven,ControlsMenu,StatTile){
2223
var Dashboard = React.createClass({
2324
getInitialState: function() {
2425
return {
@@ -59,27 +60,6 @@ define(
5960
},
6061

6162
componentDidUpdate: function(){
62-
var area = new Morris.Area({
63-
element: 'revenue-chart',
64-
resize: true,
65-
data: [
66-
{y: '2011 Q1', item1: 2666, item2: 2666},
67-
{y: '2011 Q2', item1: 2778, item2: 2294},
68-
{y: '2011 Q3', item1: 4912, item2: 1969},
69-
{y: '2011 Q4', item1: 3767, item2: 3597},
70-
{y: '2012 Q1', item1: 6810, item2: 1914},
71-
{y: '2012 Q2', item1: 5670, item2: 4293},
72-
{y: '2012 Q3', item1: 4820, item2: 3795},
73-
{y: '2012 Q4', item1: 15073, item2: 5967},
74-
{y: '2013 Q1', item1: 10687, item2: 4460},
75-
{y: '2013 Q2', item1: 8432, item2: 5713}
76-
],
77-
xkey: 'y',
78-
ykeys: ['item1', 'item2'],
79-
labels: ['Item 1', 'Item 2'],
80-
lineColors: ['#a0d0e0', '#3c8dbc'],
81-
hideHover: 'auto'
82-
});
8363

8464
$('.box ul.nav a').on('shown.bs.tab', function () {
8565
area.redraw();
@@ -130,8 +110,27 @@ define(
130110
<div className="row">
131111
<section className="col-lg-7 connectedSortable ui-sortable" >
132112
<ContainerOne>
113+
<AreaChart
114+
id="revenue-chart"
115+
data = {[
116+
{y: '2011 Q1', item1: 2666, item2: 2666},
117+
{y: '2011 Q2', item1: 2778, item2: 2294},
118+
{y: '2011 Q3', item1: 4912, item2: 1969},
119+
{y: '2011 Q4', item1: 3767, item2: 3597},
120+
{y: '2012 Q1', item1: 6810, item2: 1914},
121+
{y: '2012 Q2', item1: 5670, item2: 4293},
122+
{y: '2012 Q3', item1: 4820, item2: 3795},
123+
{y: '2012 Q4', item1: 15073, item2: 5967},
124+
{y: '2013 Q1', item1: 10687, item2: 4460},
125+
{y: '2013 Q2', item1: 8432, item2: 5713}
126+
]}
127+
xkey= 'y'
128+
ykeys= {['item1', 'item2']}
129+
labels= {['Item 1', 'Item 2']}
130+
lineColors= {['#a0d0e0', '#3c8dbc']} />
131+
133132
<DonutChart
134-
id='sales-chart'
133+
id="sales-chart"
135134
colors= {["#3c8dbc", "#f56954", "#00a65a"]}
136135
data= {[
137136
{label: "Download Sales", value: 12},

0 commit comments

Comments
 (0)