Pre-build tweaks

braxex · Jan 31, 2018 · 332a2b3 · 332a2b3
1 parent ffbe936
commit 332a2b3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -10,18 +10,18 @@
  },
  "scripts": {
  "start": "react-scripts start",
- "build": "react-scripts build",
+ "build": "node-sass-chokidar src/ -o src/ --output-style compressed && react-scripts build",
  "test": "react-scripts test --env=jsdom",
  "eject": "react-scripts eject",
  "build-css": "node-sass-chokidar src/ -o src/",
  "watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive"
  },
  "devDependencies": {
  "babel-plugin-transform-object-rest-spread": "^6.26.0",
- "bootstrap": "^4.0.0-alpha.6",
- "d3": "^4.12.0",
- "d3-geo": "^1.9.0",
- "d3-geo-projection": "^2.3.1",
+ "bootstrap": "^4.0.0",
+ "d3": "^4.12.2",
+ "d3-geo": "^1.9.1",
+ "d3-geo-projection": "^2.3.2",
  "d3-scale-chromatic": "^1.1.1",
  "d3-selection": "^1.2.0",
  "lodash": "^4.17.4",

diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
+ <!-- Global Site Tag (gtag.js) - Google Analytics -->
+ <script async src="https://www.googletagmanager.com/gtag/js?id=GA_TRACKING_ID"></script>
+ <script>
+ window.dataLayer = window.dataLayer || [];
+ function gtag(){dataLayer.push(arguments);}
+ gtag('js', new Date());
+ gtag('config', 'GA_TRACKING_ID');
+ </script>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
  <meta name="theme-color" content="#000000">

diff --git a/src/App.js b/src/App.js
@@ -80,10 +80,20 @@ class App extends Component {
  return (
 
  <div className="App">
-
  {/*Header Section*/}
  <header className="App-header">
- <h1 className="App-title">Immigration Visualizer</h1>
+ <h1 className="App-title">
+ <Tooltip
+ title={this.props.noteItems.headMsg}
+ size='small'
+ position='bottom'
+ trigger='mouseenter'
+ animation='shift'
+ interactive='true'
+ hideOnClick={true}>
+ US Immigration Visualizer
+ </Tooltip>
+ </h1>
  </header>
 
  {/*Modal Section*/}

diff --git a/src/Card.js b/src/Card.js
@@ -1,6 +1,6 @@
 
 import React, { Component } from 'react';
-import './Card.min.css';
+import './Card.css';
 
 
 class Card extends Component {

diff --git a/src/Legend.js b/src/Legend.js
@@ -1,6 +1,6 @@
 
 import React, { Component } from 'react';
-import './legend.min.css';
+import './Legend.css';
 
 let width = 30;
 

diff --git a/src/Statics.js b/src/Statics.js
@@ -61,7 +61,8 @@ export let lprStatics = [
  ];
 
  export let noteStatics = {
- lprMsg: "Lawful permanent residents (LPRs, often referred to as “immigrants” or “green card holders”) are non-citizens who are lawfully authorized to live permanently in the US. LPRs may apply to become US citizens if they meet certain eligibility requirements. LPRs do not include foreign nationals granted temporary admission to the US, such as tourists and temporary workers (including H1B visa holders). Data organized by country of birth.<br/>3-year average: ≈1.08 million/year. <br/> <br/> For more information, visit <a href='https://goo.gl/dN78yY' target='_blank'>https://goo.gl/dN78yY</a>.",
- niMsg: "Nonimmigrants (NIs) are foreign nationals granted temporary admission into the US for reasons including tourism and business trips, academic/vocational study, temporary employment, and to act as a representative of a foreign government or international organization. NIs are authorized to enter the country for specific purposes and defined periods of time, which are prescribed by their class of admission. Data organized by country of citizenship.<br/>3-year average: ≈76.1 million/year. <br/> <br/> For more information visit <a href='https://goo.gl/LJLYzc' target='_blank'>https://goo.gl/LJLYzc</a>.",
- genMsg: "Data not shown for those with unknown country of birth/origin and for countries where total activity count was less than 10 people. <br/> dw = Data withheld to limit disclosures, per government sources. <br/><br/> Source code: <a href='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/braxtonex/immigration-visualizer' target='_blank'>github.com/braxtonex/immigration-visualizer</a>."
+ lprMsg: "Lawful Permanent Residents (LPRs, often referred to as “immigrants” or “green card holders”) are non-citizens who are lawfully authorized to live permanently in the US. LPRs may apply to become US citizens if they meet certain eligibility requirements. LPRs do not include foreign nationals granted temporary admission to the US, such as tourists and temporary workers (including H1B visa holders). Data displayed by country of birth.<br/>3-year average: ≈1.08 million people/year. <br/> <br/> For more information, visit <a href='https://goo.gl/dN78yY' target='_blank'>https://goo.gl/dN78yY</a>.",
+ niMsg: "Nonimmigrants (NIs) are foreign nationals granted temporary admission into the US for reasons including tourism and business trips, academic/vocational study, temporary employment, and to act as a representative of a foreign government or international organization. NIs are authorized to enter the country for specific purposes and defined periods of time, which are prescribed by their class of admission. Data displayed by country of citizenship.<br/>3-year average: ≈76.1 million people/year. <br/> <br/> For more information visit <a href='https://goo.gl/LJLYzc' target='_blank'>https://goo.gl/LJLYzc</a>.",
+ genMsg: "Data not provided for those with unknown country of birth/origin and for countries where total activity count was less than 10 people. <br/> dw = Data withheld to limit disclosures. <br/> <br/> <a href='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/braxtonex/immigration-visualizer' target='_blank'>Learn more about the data</a>",
+ headMsg: "The US Immigration Visualizer displays immigration data from 2005 to 2016 and allows you to select what data to view in two major categories and several subcategories (hover over elements below the map to learn more). You can navigate the data years manually using the slider or via slideshow. Hover over the map to see detailed information for your selected dataset. <br/> <br/> <a href='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/braxtonex/immigration-visualizer' target='_blank'>Learn more about this project</a>"
  };
diff --git a/src/Visualizer.js b/src/Visualizer.js
@@ -1,6 +1,6 @@
 
 import React, { Component } from 'react';
-import './Visualizer.min.css';
+import './Visualizer.css';
 import * as d3 from 'd3';
 import * as d3geoproj from 'd3-geo-projection';
 import {lprScale, niScale} from './App.js';