Merge branch 'master' into issue#135

Author: Cooperbuilt

index.html

@@ -5,7 +5,7 @@
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="Veteran-founded and led, Operation Code™ is a 501(c)(3) non-profit whose mission is to aid military, vets and their families learn coding and web technologies.">
+        <meta name="description" content="Veteran-founded and led, Operation Code is a 501(c)(3) non-profit whose mission is to aid military, vets and their families learn coding and web technologies.">
         <meta name="keywords" content="operation code, veterans, software development, learn to code, keep coding, veteran coders, senate veterans, house veterans, gi bill, new gi bill, operationcode.org, #operationcode, military vets, vets">
         <meta name="author" content="Veteran Coders, for Veterans Coders">
         <meta property="og:image" content="https://static1.squarespace.com/static/586d87de725e2585df6e8448/t/5870110d6b8f5b61fdd8ee05/1483739408996/?format=500w" />

package.json

@@ -19,6 +19,7 @@
     "react-modal": "^1.7.7",
     "react-router": "^4.1.1",
     "react-router-dom": "^4.1.1",
+    "react-scroll": "^1.5.2",
     "react-table": "^6.0.5",
     "sinon": "^2.3.2",
     "universal-cookie": "^2.0.7"

public/index.html

@@ -30,7 +30,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Operation Code™</title>
+    <title>Operation Code</title>
         <!-- Start of Async Drift Code -->
         <script>
         !function() {

src/App.js

@@ -11,8 +11,8 @@ class App extends Component {
   }
 
   componentDidMount() {
-    if (process.env.NODE_ENV === 'production' && process.env.GA_TRACKER_ID) {
-      ReactGA.initialize(process.env.GA_TRACKER_ID);
+    if (process.env.NODE_ENV === 'production') {
+      ReactGA.initialize('UA-75642413-1', { debug: false });
       this.history.listen((location) => {
         ReactGA.set({ page: location.pathname });
         ReactGA.pageview(location.pathname);

src/images/General-Flag.jpg

@@ -22,14 +22,21 @@ h1, h2, h3, h4, h5, h6, a, button {
   font-family: 'PF Din Display'
 }
 
+*, *:before, *:after {
+    box-sizing: inherit;
+}
+
 h1, h2, h3, h4, h5, h6 {
   -webkit-margin-before: 0;
   -webkit-margin-after: 0;
+  margin:0;
+  padding:0;
 }
 
 /*16px*/
 body {
   font-size: 1rem;
+  line-height: 1.5;
 }
 
 /*40px*/

src/images/General-Military-Departing.jpeg

@@ -2,9 +2,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import 'font-awesome/css/font-awesome.css';
 import App from './App';
-import './normalize.global.css';
+import './shared/styles/normalize.global.css';
+import './shared/styles/react-table.global.css';
 import './index.css';
-import './index.global.css';
 
 ReactDOM.render(
   <App />,

src/images/General-Military-Departing.jpg

@@ -50,24 +50,28 @@ class CodeSchools extends Component {
 
           <div className={styles.filterButtonDiv}>
             <LinkButton
-              link="#approvedSchools"
+              link="approvedSchools"
               text="Code Schools with VA Approval"
               theme="blue"
+              scrollLink
             />
             <LinkButton
-              link="#partnerSchools"
+              link="partnerSchools"
               text="Partner Schools with Scholarships"
               theme="blue"
+              scrollLink
             />
             <LinkButton
-              link="#onlineSchools"
+              link="onlineSchools"
               text="Online Schools"
               theme="blue"
+              scrollLink
             />
             <LinkButton
-              link="#schoolsByState"
+              link="schoolsByState"
               text="Search by State"
               theme="blue"
+              scrollLink
             />
           </div>
         </Section>