Skip to content

Commit 485f522

Browse files
committed
fix: move chart layout to util
1 parent c27182a commit 485f522

File tree

5 files changed

+78
-78
lines changed

5 files changed

+78
-78
lines changed

bin/util/layout.js

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
exports.md = {
2+
grid: {},
3+
header: {
4+
grid: [0, 0, 2, 2]
5+
},
6+
table: {
7+
grid: [0, 2, 2, 7]
8+
},
9+
bar: {
10+
grid: [2, 4, 3, 3]
11+
},
12+
map: {
13+
grid: [2, 0, 3, 4]
14+
},
15+
donut: {
16+
grid: [2, 7, 3, 2]
17+
},
18+
line: {
19+
grid: [5, 0, 4, 9]
20+
},
21+
footer: {
22+
grid: [8, 0, 2, 9]
23+
}
24+
}
25+
26+
exports.lg = {
27+
grid: {},
28+
header: {
29+
grid: [0, 0, 1, 10]
30+
},
31+
table: {
32+
grid: [1, 0, 2, 10]
33+
},
34+
bar: {
35+
grid: [3, 5, 3, 3]
36+
},
37+
map: {
38+
grid: [3, 0, 3, 5]
39+
},
40+
donut: {
41+
grid: [3, 8, 3, 2]
42+
},
43+
line: {
44+
grid: [6, 0, 4, 10]
45+
},
46+
footer: {
47+
grid: [9, 0, 2, 10]
48+
}
49+
}
50+
51+
exports.sm = {
52+
grid: {},
53+
header: {
54+
grid: [0, 0, 2, 2]
55+
},
56+
table: {
57+
grid: [2, 0, 2, 5],
58+
columnSpacing: 3
59+
},
60+
bar: {
61+
grid: [4, 0, 3, 3],
62+
xOffset: 6
63+
},
64+
map: {
65+
grid: [0, 2, 2, 3]
66+
},
67+
donut: {
68+
grid: [4, 3, 3, 2]
69+
},
70+
line: {
71+
grid: [7, 0, 3, 5]
72+
},
73+
footer: {
74+
grid: [9, 0, 2, 5]
75+
}
76+
}

lib/cli/gfx/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const
44
say = require('../../sayings/threads.json'),
55
serverUtil = require('./server-util')
66
template = require ('./template.js'),
7+
{sm, md, lg} = require('../../../bin/util/layout')
78
ts = Date.now(),
89
date_ob = new Date(ts),
910
date = date_ob.getDate(),
@@ -52,11 +53,8 @@ exports.historyCountryTracker = (req, res, n, c, tC, d, tD, r, a, cl, cPOM, u, h
5253
specialfooter = ansiGCash+br+ansiBMC+ansiTwitter+br+br,
5354
defaultHeader = header+br+tagline,
5455
footer = (n.toLowerCase() == 'philippines') ? tableFooter+br+specialfooter+br+source+br+repo : tableFooter+br+defaultfooter+br+source+br+repo,
55-
allowedDefaultChartSize = ['sm', 'md', 'lg'],
56-
defaultChartStyle = require(`../gfx/layout/${allowedDefaultChartSize.indexOf(chartSize) != -1 ? chartSize: allowedDefaultChartSize[0] }.json`);
56+
defaultChartStyle = chartSize === 'sm' ? sm : (chartSize === 'md' ? md : lg);
5757

58-
// load template with data
59-
// serverUtil.loadTemplate(template, {jsonStyle}, {jsonData}, callback)
6058
serverUtil.loadTemplate(template, defaultChartStyle, {
6159
name,
6260
cases,

lib/cli/gfx/layout/lg.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

lib/cli/gfx/layout/md.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

lib/cli/gfx/layout/sm.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)