Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
xgirma committed Aug 14, 2020
1 parent dbdf54f commit 84495b9
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"new-cap": 0,
"camelcase": 0,
"no-param-reassign": 0,
"no-prototype-builtins": 0
"no-prototype-builtins": 0,
"prefer-spread": 0,
"import/no-named-as-default": 0,
"import/no-named-as-default-member": 0
}
}
22 changes: 10 additions & 12 deletions chart/bar_chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const d3 = require("d3");
const jsdom = require("jsdom");
const { writeFileSync } = require("fs");

function barchartChartSvg(data, path) {
function barChartSvg(data, path) {
const { JSDOM } = jsdom;

const max = Math.max.apply(
Math,
data.map(function (o) {
data.map((o) => {
return o.value;
})
);
Expand All @@ -27,13 +27,11 @@ function barchartChartSvg(data, path) {
.attr("width", width + margin.left + margin.right)
.attr("height", height + margin.top + margin.bottom)
.append("g")
.attr("transform", `translate(${margin.left},${margin.top})`);
.attr("transform", `translate(${margin.left},${margin.top})`)
.attr("xmlns", "http://www.w3.org/2000/svg")
.attr("xmlns:xlink", "http://www.w3.org/1999/xlink");

const x = d3.scaleLinear().domain([0, max]).range([0, width]);
//
// svg
// .attr("xmlns", "http://www.w3.org/2000/svg")
// .attr("xmlns:xlink", "http://www.w3.org/1999/xlink");

svg
.append("g")
Expand All @@ -59,12 +57,12 @@ function barchartChartSvg(data, path) {
.attr("y", (d) => y(d.name))
.attr("width", (d) => x(d.value))
.attr("height", y.bandwidth())
// .attr("font-family", "sans-serif")
// .attr("font-size", "14px")
// .attr("fill", "#f4c63d")
// .attr("text-anchor", "middle");
.attr("font-family", "sans-serif")
.attr("font-size", "14px")
.attr("fill", "#f4c63d")
.attr("text-anchor", "middle");

writeFileSync(path, body.node().innerHTML);
}

export default barchartChartSvg;
export default barChartSvg;
7 changes: 4 additions & 3 deletions chart/referrers.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import barChartSvg from "./bar_chart";

const count = require("../data/chart/referrer/count.json");
const unique = require("../data/chart/referrer/unique.json");
import barchartChartSvg from "./bar_chart";

const c = JSON.parse(JSON.stringify(count));
const u = JSON.parse(JSON.stringify(unique));

barchartChartSvg(c, './chart/referrers/count.svg');
barchartChartSvg(u, './chart/referrers/unique.svg');
barChartSvg(c, "./chart/referrers/count.svg");
barChartSvg(u, "./chart/referrers/unique.svg");
1 change: 0 additions & 1 deletion chart/sample.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ function getSample() {
formattedCount.sort((a, b) => (a.value > b.value ? 1 : -1));
const contentCount = JSON.stringify(formattedCount, null, 2);


const formattedUnique = prepareSample(uniqueData);
formattedUnique.sort((a, b) => (a.value > b.value ? 1 : -1));
const contentUnique = JSON.stringify(formattedUnique, null, 2);
Expand Down

0 comments on commit 84495b9

Please sign in to comment.