From eb76acab42ef665b8cf26dd2ed846a6728144b58 Mon Sep 17 00:00:00 2001 From: Jacob Wentz Date: Thu, 3 Aug 2017 08:28:07 -0400 Subject: [PATCH 1/5] Changes to increase the text and X-Axis and Y-Axis font --- env.sample | 2 +- src/components/TrendChart.js | 2 +- src/components/XAxis.js | 2 +- src/components/YAxis.js | 2 +- src/server.js | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/env.sample b/env.sample index a34c7246..01e7551d 100644 --- a/env.sample +++ b/env.sample @@ -1,3 +1,3 @@ -export API_KEY="get your key at https://api.data.gov/signup/" +export API_KEY="get your key at https://api.data.gov/signup" export CDE_API="https://api.usa.gov/crime/fbi/ucr" export PORT=6005 diff --git a/src/components/TrendChart.js b/src/components/TrendChart.js index 004f4c62..08127fbe 100644 --- a/src/components/TrendChart.js +++ b/src/components/TrendChart.js @@ -155,7 +155,7 @@ class TrendChart extends React.Component { until={until} />
-
+
Rate per 100,000 people, by year
{crime === 'rape' && } diff --git a/src/components/XAxis.js b/src/components/XAxis.js index c918f923..ee898375 100644 --- a/src/components/XAxis.js +++ b/src/components/XAxis.js @@ -28,7 +28,7 @@ const XAxis = ({ active, tickCt, tickSizeOuter, height, scale, showLine }) => { className={`tick ${String(v) === String(active) ? 'bold' : ''}`} > - {format(v)} + {format(v)} ) }) diff --git a/src/components/YAxis.js b/src/components/YAxis.js index cb858764..07fc7f53 100644 --- a/src/components/YAxis.js +++ b/src/components/YAxis.js @@ -17,7 +17,7 @@ const YAxis = ({ tickCt, scale, width }) => { return ( - {fmt(v)} + {fmt(v)} ) }) diff --git a/src/server.js b/src/server.js index bfc0c539..66cc539e 100644 --- a/src/server.js +++ b/src/server.js @@ -70,12 +70,13 @@ app.get('/api-proxy/*', (req, res) => { if (!apiKey) return res.status(401).end() return http - .get(route, { params }) + .get(route, { params}) .then(r => { res.set(r.headers) res.send(r.data) }) .catch(e => { + console.log("Proxy API Error:",e); res.status(e.response.status).end() }) }) From f1ca974f294c88dc9bff69f876a5c6d65b822398 Mon Sep 17 00:00:00 2001 From: Jacob Wentz Date: Thu, 3 Aug 2017 14:32:51 -0400 Subject: [PATCH 2/5] Fix to Server JS Lint failures --- src/server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server.js b/src/server.js index 66cc539e..bfc0c539 100644 --- a/src/server.js +++ b/src/server.js @@ -70,13 +70,12 @@ app.get('/api-proxy/*', (req, res) => { if (!apiKey) return res.status(401).end() return http - .get(route, { params}) + .get(route, { params }) .then(r => { res.set(r.headers) res.send(r.data) }) .catch(e => { - console.log("Proxy API Error:",e); res.status(e.response.status).end() }) }) From 96ddf2160c6b7898031705951dce3d869c965cda Mon Sep 17 00:00:00 2001 From: Jacob Wentz Date: Thu, 3 Aug 2017 08:28:07 -0400 Subject: [PATCH 3/5] Changes to increase the text and X-Axis and Y-Axis font --- env.sample | 2 +- src/components/TrendChart.js | 2 +- src/components/XAxis.js | 2 +- src/components/YAxis.js | 2 +- src/server.js | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/env.sample b/env.sample index a34c7246..01e7551d 100644 --- a/env.sample +++ b/env.sample @@ -1,3 +1,3 @@ -export API_KEY="get your key at https://api.data.gov/signup/" +export API_KEY="get your key at https://api.data.gov/signup" export CDE_API="https://api.usa.gov/crime/fbi/ucr" export PORT=6005 diff --git a/src/components/TrendChart.js b/src/components/TrendChart.js index 004f4c62..08127fbe 100644 --- a/src/components/TrendChart.js +++ b/src/components/TrendChart.js @@ -155,7 +155,7 @@ class TrendChart extends React.Component { until={until} />
-
+
Rate per 100,000 people, by year
{crime === 'rape' && } diff --git a/src/components/XAxis.js b/src/components/XAxis.js index c918f923..ee898375 100644 --- a/src/components/XAxis.js +++ b/src/components/XAxis.js @@ -28,7 +28,7 @@ const XAxis = ({ active, tickCt, tickSizeOuter, height, scale, showLine }) => { className={`tick ${String(v) === String(active) ? 'bold' : ''}`} > - {format(v)} + {format(v)} ) }) diff --git a/src/components/YAxis.js b/src/components/YAxis.js index cb858764..07fc7f53 100644 --- a/src/components/YAxis.js +++ b/src/components/YAxis.js @@ -17,7 +17,7 @@ const YAxis = ({ tickCt, scale, width }) => { return ( - {fmt(v)} + {fmt(v)} ) }) diff --git a/src/server.js b/src/server.js index bfc0c539..66cc539e 100644 --- a/src/server.js +++ b/src/server.js @@ -70,12 +70,13 @@ app.get('/api-proxy/*', (req, res) => { if (!apiKey) return res.status(401).end() return http - .get(route, { params }) + .get(route, { params}) .then(r => { res.set(r.headers) res.send(r.data) }) .catch(e => { + console.log("Proxy API Error:",e); res.status(e.response.status).end() }) }) From 2fb59719f81e55c49597710c9d7a1d64839d24ae Mon Sep 17 00:00:00 2001 From: Jacob Wentz Date: Thu, 3 Aug 2017 14:32:51 -0400 Subject: [PATCH 4/5] Fix to Server JS Lint failures --- src/server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server.js b/src/server.js index 66cc539e..bfc0c539 100644 --- a/src/server.js +++ b/src/server.js @@ -70,13 +70,12 @@ app.get('/api-proxy/*', (req, res) => { if (!apiKey) return res.status(401).end() return http - .get(route, { params}) + .get(route, { params }) .then(r => { res.set(r.headers) res.send(r.data) }) .catch(e => { - console.log("Proxy API Error:",e); res.status(e.response.status).end() }) }) From 612461f18d8bd2307c3ba069543eedae9b7e0899 Mon Sep 17 00:00:00 2001 From: Jacob Wentz Date: Wed, 9 Aug 2017 13:20:24 -0400 Subject: [PATCH 5/5] Grids Font size change --- sass/components/_viz.scss | 2 +- src/components/TrendChart.js | 2 +- src/components/XAxis.js | 2 +- src/components/YAxis.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sass/components/_viz.scss b/sass/components/_viz.scss index 0227b993..0751088c 100644 --- a/sass/components/_viz.scss +++ b/sass/components/_viz.scss @@ -1,7 +1,7 @@ .axis { fill: none; font-family: $font-monospace; - font-size: 10px; + font-size: 12px; line, path { diff --git a/src/components/TrendChart.js b/src/components/TrendChart.js index 08127fbe..712fdc34 100644 --- a/src/components/TrendChart.js +++ b/src/components/TrendChart.js @@ -155,7 +155,7 @@ class TrendChart extends React.Component { until={until} />
-
+
Rate per 100,000 people, by year
{crime === 'rape' && } diff --git a/src/components/XAxis.js b/src/components/XAxis.js index ee898375..c918f923 100644 --- a/src/components/XAxis.js +++ b/src/components/XAxis.js @@ -28,7 +28,7 @@ const XAxis = ({ active, tickCt, tickSizeOuter, height, scale, showLine }) => { className={`tick ${String(v) === String(active) ? 'bold' : ''}`} > - {format(v)} + {format(v)} ) }) diff --git a/src/components/YAxis.js b/src/components/YAxis.js index 07fc7f53..cb858764 100644 --- a/src/components/YAxis.js +++ b/src/components/YAxis.js @@ -17,7 +17,7 @@ const YAxis = ({ tickCt, scale, width }) => { return ( - {fmt(v)} + {fmt(v)} ) })