Skip to content

Commit 1eb49ba

Browse files
kum-deepakkum-deepak
committed
Creating layout for examples, configure JS and CSS to load from CDN, updated bootstrap to the latest version
1 parent 8b0fa41 commit 1eb49ba

File tree

6 files changed

+95
-73
lines changed

6 files changed

+95
-73
lines changed

‎_config.yml

-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ description: >- # this means to ignore newlines until "baseurl:"
1919
dc.js.
2020
baseurl: "" # the subpath of your site, e.g. /blog
2121
url: "" # the base hostname & protocol for your site, e.g. http://example.com
22-
cdn:
23-
js:
24-
dc: "https://cdn.jsdelivr.net/gh/dc-js/dc-js.github.io/js/dc.min.js"
25-
crossfilter: "https://cdnjs.cloudflare.com/ajax/libs/crossfilter2/1.5.4/crossfilter.min.js"
26-
d3: "https://cdnjs.cloudflare.com/ajax/libs/d3/7.6.1/d3.min.js"
2722

2823
# Build settings
2924
markdown: kramdown

‎_includes/cdn-css-links.html

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<link
2+
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
3+
rel="stylesheet"
4+
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
5+
crossorigin="anonymous"
6+
/>
7+
<link
8+
rel="stylesheet"
9+
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/style/dc.min.css"
10+
integrity="sha256-TBtTN65IWvMLzVE4ovLuYS5W/cJihvpPJdlIwcuBgE8="
11+
crossorigin="anonymous"
12+
/>

‎_includes/cdn-js-links.html

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1-
<script type="text/javascript" src="{{ site.cdn.js.d3 }}"></script>
2-
<script type="text/javascript" src="{{ site.cdn.js.crossfilter }}"></script>
3-
<script type="text/javascript" src="{{ site.cdn.js.dc }}"></script>
1+
<script
2+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/d3.min.js"
3+
integrity="sha256-1rA678n2xEx7x4cTZ5x4wpUCj6kUMZEZ5cxLSVSFWxw="
4+
crossorigin="anonymous"
5+
></script>
6+
<script
7+
src="https://cdn.jsdelivr.net/npm/[email protected]/crossfilter.min.js"
8+
integrity="sha256-dcKlRjBWIDbRoJHdV1u4UtIsIXmBeXV91E0TvgOlLlY="
9+
crossorigin="anonymous"
10+
></script>
11+
<script
12+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/dc.min.js"
13+
integrity="sha256-Vgdsoz8W65OTPCWukVMm2wNBrRBHXJ5v8cpdUE2CSxw="
14+
crossorigin="anonymous"
15+
></script>
16+
<script
17+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
18+
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
19+
crossorigin="anonymous"
20+
></script>

‎_layouts/example.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
---
3+
4+
<!DOCTYPE html>
5+
<html lang="en">
6+
<head>
7+
<title>dc.js - Line Chart Example</title>
8+
<meta charset="UTF-8" />
9+
{% include cdn-css-links.html %}
10+
</head>
11+
<body>
12+
<div class="container">
13+
<div id="header"></div>
14+
<!-- <script type="text/javascript" src="header.js"></script>-->
15+
{% include cdn-js-links.html %} {{ content }}
16+
</div>
17+
</body>
18+
</html>

‎examples/line.html

+43-63
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,49 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
<head>
4-
<title>dc.js - Line Chart Example</title>
5-
<meta charset="UTF-8" />
6-
<link
7-
rel="stylesheet"
8-
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
9-
integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx"
10-
crossorigin="anonymous"
11-
/>
12-
<!-- <link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css" /> -->
13-
<link rel="stylesheet" type="text/css" href="../css/dc.css" />
14-
</head>
15-
<body>
16-
<div class="container">
17-
<div id="header"></div>
18-
<div id="test"></div>
1+
---
2+
layout: example
3+
---
194

20-
<script type="text/javascript" src="header.js"></script>
21-
<script type="text/javascript" src="../js/d3.js"></script>
22-
<script type="text/javascript" src="../js/crossfilter.js"></script>
23-
<script type="text/javascript" src="../js/dc.js"></script>
24-
<script type="text/javascript">
25-
const chartGroup = new dc.ChartGroup();
26-
const chart = new dc.LineChart('#test', chartGroup);
27-
d3.csv('morley.csv').then(experiments => {
28-
experiments.forEach(x => {
29-
x.Speed = +x.Speed;
30-
});
5+
<div id="test"></div>
316

32-
const ndx = crossfilter(experiments),
33-
runDimension = ndx.dimension(d => +d.Run),
34-
speedSumGroup = runDimension
35-
.group()
36-
.reduceSum(d => (d.Speed * d.Run) / 1000);
7+
<script type="text/javascript">
8+
const chartGroup = new dc.ChartGroup();
9+
const chart = new dc.LineChart('#test', chartGroup);
10+
d3.csv('morley.csv').then(experiments => {
11+
experiments.forEach(x => {
12+
x.Speed = +x.Speed;
13+
});
3714

38-
chart
39-
.configure({
40-
width: 768,
41-
height: 480,
42-
})
43-
.dataProvider(
44-
new dc.CFMultiAdapter({
45-
dimension: runDimension,
15+
const ndx = crossfilter(experiments),
16+
runDimension = ndx.dimension(d => +d.Run),
17+
speedSumGroup = runDimension
18+
.group()
19+
.reduceSum(d => (d.Speed * d.Run) / 1000);
20+
21+
chart
22+
.configure({
23+
width: 768,
24+
height: 480,
25+
})
26+
.dataProvider(
27+
new dc.CFMultiAdapter({
28+
dimension: runDimension,
4629

47-
layers: [
48-
{
49-
group: speedSumGroup,
50-
},
51-
],
52-
})
53-
)
54-
.configure({
55-
brushOn: false,
56-
clipPadding: 10,
30+
layers: [
31+
{
32+
group: speedSumGroup,
33+
},
34+
],
5735
})
58-
.x(d3.scaleLinear().domain([0, 20]))
59-
.curve(d3.curveStepBefore)
60-
.renderArea(true)
61-
.renderDataPoints(true)
62-
.yAxisLabel('This is the Y Axis!');
36+
)
37+
.configure({
38+
brushOn: false,
39+
clipPadding: 10,
40+
})
41+
.x(d3.scaleLinear().domain([0, 20]))
42+
.curve(d3.curveStepBefore)
43+
.renderArea(true)
44+
.renderDataPoints(true)
45+
.yAxisLabel('This is the Y Axis!');
6346

64-
chart.render();
65-
});
66-
</script>
67-
</div>
68-
</body>
69-
</html>
47+
chart.render();
48+
});
49+
</script>

‎index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ <h2>Nasdaq 100 Index 1985/11/01-2012/06/29</h2>
166166

167167
<div class="clearfix"></div>
168168

169-
<a href="https://github.com/dc-js/dc.js"><img style="position: absolute; top: 0; right: 0; border: 0;"
170-
src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"
169+
<a href="https://github.com/dc-js/dc.js"><img style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px"
170+
src="https://github.blog/wp-content/uploads/2008/12/forkme_right_gray_6d6d6d.png?resize=149%2C149"
171171
alt="Fork me on GitHub"></a>
172172
</div>
173173

0 commit comments

Comments
 (0)