From 976ca732d8d9be61c48c4a5b8c45e16529bd4006 Mon Sep 17 00:00:00 2001
From: Esteban Santana Santana <MentalPower@GMail.com>
Date: Thu, 28 Sep 2017 11:52:10 -0700
Subject: [PATCH 1/4] Fixed key injection script

Also added Tokynet's keys
---
 appspec.yml             | 5 ++++-
 config/authorized_keys  | 1 -
 config/extra_keys       | 2 ++
 scripts/install-keys.sh | 3 +--
 scripts/monitor-app.sh  | 6 +++---
 scripts/start-app.sh    | 6 +++---
 scripts/stop-app.sh     | 6 +++---
 7 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 config/authorized_keys
 create mode 100644 config/extra_keys

diff --git a/appspec.yml b/appspec.yml
index 040e108..8c29d73 100644
--- a/appspec.yml
+++ b/appspec.yml
@@ -5,6 +5,8 @@ files:
     destination: /opt/www/prfaa-donations-frontend
   - source: /config/nginx.conf
     destination: /etc/nginx
+  - source: /config/extra_keys
+    destination: /home/ec2-user/.ssh/
 permissions:
   - object: /opt/www/prfaa-donations-frontend
     pattern: "**"
@@ -18,8 +20,9 @@ hooks:
   ApplicationStop:
     - location: scripts/stop-app.sh
   BeforeInstall:
-    - location: scripts/install-keys.sh
     - location: scripts/install-app.sh
+  AfterInstall:
+    - location: scripts/install-keys.sh
   ApplicationStart:
     - location: scripts/start-app.sh
   ValidateService:
diff --git a/config/authorized_keys b/config/authorized_keys
deleted file mode 100644
index be2a104..0000000
--- a/config/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypGXPf3vHlr6gG7lzjwkRVUGX2D7Ufe+5U15vLAD35Kon6zAlq9qVQ4+vQyiJyO/gOvioBGT5Pwjx82gbHoMNKpEQTZtTez6s9AwhN5tHIUBjVnigH3JR8DUwvA9HFjGfLqIJkecT6KV/CPPH4Amv3SDFA4VvRNTEZ3ndP8amCjSAuaQvGiUO5qPRCMeRoSYtwmRTkC59qaGaApcRVErSoN3ODSS5CxaZTVqGeVT1S+hqjsCmqHJiClpY7rnw+cXyBC3Iusmqehrg/YikXQGLFYhyPo8u2Pw6G8T2A3jy0vj6BaW0Zf3dkBCV26gyckZXHHtE03sU/FJaVUC1ng+nQ== nabeards@me.com
diff --git a/config/extra_keys b/config/extra_keys
new file mode 100644
index 0000000..8d5bd18
--- /dev/null
+++ b/config/extra_keys
@@ -0,0 +1,2 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypGXPf3vHlr6gG7lzjwkRVUGX2D7Ufe+5U15vLAD35Kon6zAlq9qVQ4+vQyiJyO/gOvioBGT5Pwjx82gbHoMNKpEQTZtTez6s9AwhN5tHIUBjVnigH3JR8DUwvA9HFjGfLqIJkecT6KV/CPPH4Amv3SDFA4VvRNTEZ3ndP8amCjSAuaQvGiUO5qPRCMeRoSYtwmRTkC59qaGaApcRVErSoN3ODSS5CxaZTVqGeVT1S+hqjsCmqHJiClpY7rnw+cXyBC3Iusmqehrg/YikXQGLFYhyPo8u2Pw6G8T2A3jy0vj6BaW0Zf3dkBCV26gyckZXHHtE03sU/FJaVUC1ng+nQ== nabeards@me.com
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFlNSt4t03/VKWz9nT3PzpgHNbxefUVOAwktPKEpbCpfWpUQ0NpKfNsgmUCuC/xXUnDvHzUDuV3QL0vNDGjxnXIqA7GFRBwRuNKPWf4DHatIRWL/iFX/+FjWhplPrQofQpXnuTZMGYK+WJuviO8y4RtbEb0FKeY87p/6hOS3cH9bdnJTZVOKhwpC7HLHCoUmLy8iR8VJT3aYsN8N8H/rDfSMzUQyicjwH7WPSxETqflpbiUYszy+k9ZayxkHbYkbTW/bTrueEcK1oho4uSYtY5U5UC0FDNeQh2iE/YxhDJ2MSrSncaKw+wrcUD6MS7opqVbSP5F3jcwS82LjmF5ZqKBR59s4fZJWe5mrphT5rpMPr+FgK0kHV6QoSPamJptiR8FdaO/W47wad+kfQJbIr/2KDx2zReTuSrGeQezD2Zfs769rMp2i4AjbDEu+zX7dhwgyNZHsDHh5KItmRMX8LNwC+xlxKumnZ+kA5/QrCMVjBszwvU08GZmCx2xG8Pnt9B+k1pjr2/t9Bi/iPqlWD6NXfGYPJXQedIwKfuPTdLfbLXF9FCmDXeX4a/Npigzze8my73nEuxw22uvedrOz348MDOxhbF8VxsNguElsZZiqScVL2YaCW8Uyuuk5AVeu9aqWSsh202S3YS6DpHAOuA6l6K9EJviyeu8vjgFPPZRQ== MiguelCruz
diff --git a/scripts/install-keys.sh b/scripts/install-keys.sh
index 4b8f01e..591fa2c 100755
--- a/scripts/install-keys.sh
+++ b/scripts/install-keys.sh
@@ -1,3 +1,2 @@
 #!/bin/bash
-
-cat ../config/authorized_keys >> /home/ec2-user/.ssh/authorized_keys
+cat /home/ec2-user/.ssh/extra_keys >> /home/ec2-user/.ssh/authorized_keys
diff --git a/scripts/monitor-app.sh b/scripts/monitor-app.sh
index 179b1c4..6be4190 100755
--- a/scripts/monitor-app.sh
+++ b/scripts/monitor-app.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
-
-curl http://localhost/index.html
+#!/bin/bash
+
+curl http://localhost/index.html
diff --git a/scripts/start-app.sh b/scripts/start-app.sh
index 5d5f0b7..35c9a83 100755
--- a/scripts/start-app.sh
+++ b/scripts/start-app.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
-
-service nginx start
+#!/bin/bash
+
+service nginx start
diff --git a/scripts/stop-app.sh b/scripts/stop-app.sh
index a611d66..107b43a 100755
--- a/scripts/stop-app.sh
+++ b/scripts/stop-app.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
-
-service nginx stop
+#!/bin/bash
+
+service nginx stop

From 2bd3ad293a26bb5068be1d3f243c67cb19b8442e Mon Sep 17 00:00:00 2001
From: Sammy Rivera <samuel.rivera@infoscoutinc.com>
Date: Thu, 5 Oct 2017 23:37:43 -0700
Subject: [PATCH 2/4] State was not Immutable in the donation form. Removed
 console warnings caused by lack of <Router> component Removed console
 warnings caused by prop-types for the <Select> component. No boolean values
 allowed. Refactored code to use functional components when possible.
 Refactored code to remove unnecessary whitespaces Fixed test

---
 package.json                                | 18 +++---
 src/App.js                                  | 39 +++++-------
 src/App.test.js                             |  2 +-
 src/Confirm/components/confirm.js           | 15 ++---
 src/DonationForm/components/donationForm.js | 68 ++++++++-------------
 src/DonationForm/lib/options.js             |  4 +-
 src/Layout/components/footer.js             |  1 -
 src/Layout/components/header.js             | 58 +++++++++---------
 src/Layout/layout.js                        | 25 +++-----
 src/Search/components/search.js             |  3 +-
 src/ThankYou/components/thankYou.js         | 20 +++---
 yarn.lock                                   | 10 +++
 12 files changed, 120 insertions(+), 143 deletions(-)

diff --git a/package.json b/package.json
index 271bf83..4bb2ced 100644
--- a/package.json
+++ b/package.json
@@ -4,20 +4,22 @@
   "private": true,
   "dependencies": {
     "axios": "^0.16.2",
-      "feathers": "^2.2.1",
-      "feathers-hooks": "^2.1.0",
-      "feathers-rest": "^1.8.0",
-      "feathers-socketio": "^2.0.0",
+    "feathers": "^2.2.1",
+    "feathers-hooks": "^2.1.0",
+    "feathers-rest": "^1.8.0",
+    "feathers-socketio": "^2.0.0",
     "formsy-react": "^1.0.0",
     "formsy-react-components": "^1.0.0-alpha.5",
-      "query-string": "^5.0.0",
+    "node-uuid": "^1.4.8",
+    "query-string": "^5.0.0",
     "react": "^15.6.1",
     "react-bootstrap": "^0.31.3",
     "react-dom": "^15.6.1",
+    "react-router-bootstrap": "^0.24.4",
     "react-router-dom": "^4.2.2",
-      "react-scripts": "1.0.13",
-      "socket.io-client": "^2.0.3",
-      "superagent": "^3.6.0"
+    "react-scripts": "1.0.13",
+    "socket.io-client": "^2.0.3",
+    "superagent": "^3.6.0"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/src/App.js b/src/App.js
index 8e606fa..8f70f6a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,33 +1,26 @@
-import React, { Component } from 'react';
-import { Route, Switch } from 'react-router-dom';
-
+import React  from 'react';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
 import Layout from './Layout/layout.js'
-import Footer from './Layout/components/footer.js'
-
 import LandingPage from './LandingPage/components/landingPage.js'
 import DonationForm from './DonationForm/components/donationForm.js'
 import ThankYou from './ThankYou/components/thankYou.js'
 import Confirm from './Confirm/components/confirm.js'
 import Search from './Search/components/search.js'
-
 import './Bootstrap3.3.7/bootstrap.min.css';
-
 import './App.css';
 
-class App extends Component {
-    render() {
-        return (
-            <Layout>
-                <Switch>
-                    <Route exact path="/" component={LandingPage} />
-                    <Route exact path="/donation-form" component={DonationForm} />
-                    <Route exact path="/donation-form/thank-you" component={ThankYou} />
-                    <Route exact path="/confirm" component={Confirm} />
-                    <Route exact path="/search" component={Search} />
-                </Switch>
-            </Layout>
-        );
-    }
+export default function App() {
+    return (
+      <Router>
+        <Layout>
+          <Switch>
+              <Route exact path="/" component={LandingPage} />
+              <Route exact path="/donation-form" component={DonationForm} />
+              <Route exact path="/donation-form/thank-you" component={ThankYou} />
+              <Route exact path="/confirm" component={Confirm} />
+              <Route exact path="/search" component={Search} />
+          </Switch>
+        </Layout>
+      </Router>
+    );
 }
-
-export default App;
diff --git a/src/App.test.js b/src/App.test.js
index 6014602..f220b54 100644
--- a/src/App.test.js
+++ b/src/App.test.js
@@ -4,5 +4,5 @@ import App from './App';
 
 it('renders without crashing', () => {
     const div = document.createElement('div');
-    ReactDOM.render(<App />, div);
+    ReactDOM.render(App(), div);
 });
diff --git a/src/Confirm/components/confirm.js b/src/Confirm/components/confirm.js
index 995c083..576c67c 100644
--- a/src/Confirm/components/confirm.js
+++ b/src/Confirm/components/confirm.js
@@ -9,17 +9,17 @@ export default class Confirm extends Component {
         this.state = {
             confirmed: false,
             error:     false
-        }
+        };
     }
 
     componentDidMount() {
         const confirmService = client.service('confirm');
-        const qs             = queryString.parse(this.props.location.search);
+        const qs = queryString.parse(this.props.location.search);
 
         if (qs.id) {
             confirmService.get(qs.id)
-                .then(() => this.setState({confirmed: true}))
-                .catch((err) => this.setState({error: err}));
+              .then(() => this.setState({confirmed: true}))
+              .catch((err) => this.setState({error: err}));
         }
     }
 
@@ -32,8 +32,7 @@ export default class Confirm extends Component {
                     <h1>Confirming your Donation... (please wait)</h1>
                 </div>
             );
-        }
-        else if (this.state.confirmed) {
+        } else if (this.state.confirmed) {
             jsx = (
                 <div>
                     <h1>Thank You for Confirming your Donation!</h1>
@@ -45,8 +44,7 @@ export default class Confirm extends Component {
                     <Link to='/'>Landing page link</Link>
                 </div>
             );
-        }
-        else if (this.state.error) {
+        } else if (this.state.error) {
             jsx = (
                 <div>
                     <h1>Sorry, we were unable to confirm your donation at this time.</h1>
@@ -56,7 +54,6 @@ export default class Confirm extends Component {
                 </div>
             );
         }
-
         return jsx;
     }
 }
diff --git a/src/DonationForm/components/donationForm.js b/src/DonationForm/components/donationForm.js
index 04d335e..021c33f 100644
--- a/src/DonationForm/components/donationForm.js
+++ b/src/DonationForm/components/donationForm.js
@@ -2,58 +2,44 @@ import React, { Component } from 'react';
 import donationFormActions from '../actions/donationFormActions.js'
 import InputMask from '../../utils/inputMask.js'
 import Options from '../lib/options.js'
-import {
-    Form,
-    Input,
-    Select,
-    Textarea
-} from 'formsy-react-components';
-
-import {
-    Grid,
-    Row,
-    Col,
-    Jumbotron
-} from 'react-bootstrap'
-
+import { Form, Input, Select, Textarea } from 'formsy-react-components';
+import { Grid, Jumbotron } from 'react-bootstrap'
 import '../style/donationForm.css';
 
-
 export default class DonationForm extends Component {
     constructor() {
-        super()
-        this.state                       = {
+        super();
+        this.state = {
             showTranportationOptions: false,
             invalidSubmit:            false,
             submissionErrors:         []
-        }
-        this.phoneMask                   = new InputMask('(___) ___ - ____', '_')
-        this.zipCodeMask                 = new InputMask('_____', '_')
-        this.invalidSubmit               = this.invalidSubmit.bind(this)
-        this.isValid                     = this.isValid.bind(this)
-        this.transportationNeededChanged = this.transportationNeededChanged.bind(this)
-        this.successfulSubmission        = this.successfulSubmission.bind(this)
-        this.submissionError             = this.submissionError.bind(this)
+        };
+        this.phoneMask = new InputMask('(___) ___ - ____', '_');
+        this.zipCodeMask = new InputMask('_____', '_');
+        this.invalidSubmit = this.invalidSubmit.bind(this);
+        this.isValid = this.isValid.bind(this);
+        this.transportationNeededChanged = this.transportationNeededChanged.bind(this);
+        this.successfulSubmission = this.successfulSubmission.bind(this);
+        this.submissionError = this.submissionError.bind(this);
     }
 
     componentDidMount() {
-        document.addEventListener('donationSubmitted', this.successfulSubmission)
-        document.addEventListener('submissionError', this.submissionError)
+        document.addEventListener('donationSubmitted', this.successfulSubmission);
+        document.addEventListener('submissionError', this.submissionError);
     }
 
     componentWillUnmount() {
-        document.removeEventListener('donationSubmitted', this.successfulSubmission)
-        document.removeEventListener('submissionError', this.submissionError)
+        document.removeEventListener('donationSubmitted', this.successfulSubmission);
+        document.removeEventListener('submissionError', this.submissionError);
     }
 
     successfulSubmission() {
-        this.props.history.push('/donation-form/thank-you')
+        this.props.history.push('/donation-form/thank-you');
     }
 
     submissionError() {
-        let errorArray = this.state.submissionErrors
-        errorArray.push('There was an error processing your request.')
-        this.setState({submissionErrors: errorArray})
+        const submissionErrors = [...this.state.submissionErrors, 'There was an error processing your request.'];
+        this.setState({ submissionErrors });
     }
 
     handleValidSubmission(data) {
@@ -65,20 +51,18 @@ export default class DonationForm extends Component {
     }
 
     invalidSubmit() {
-        let errorArray = this.state.submissionErrors
-        errorArray.push('Please fix the errors above.')
-        this.setState({submissionErrors: errorArray})
+        const submissionErrors = [...this.state.submissionErrors , 'Please fix the errors above.'];
+        this.setState({ submissionErrors });
     }
 
     isValid() {
-        let errorArray = this.state.submissionErrors
-        let errorIndex = this.state.submissionErrors.indexOf('Please fix the errors above.')
-        errorArray.splice(errorIndex, 1)
-        this.setState({submissionErrors: errorArray})
+        const errorIndex = this.state.submissionErrors.indexOf('Please fix the errors above.');
+        const submissionErrors = this.state.submissionErrors.slice(errorIndex, 1);
+        this.setState({ submissionErrors })
     }
 
     transportationNeededChanged() {
-        this.setState({showTranportationOptions: !this.state.showTranportationOptions})
+        this.setState({ showTranportationOptions: !this.state.showTranportationOptions })
     }
 
     render() {
@@ -203,7 +187,7 @@ export default class DonationForm extends Component {
                                 name="transportationNeed"
                                 label="Do you need transportation of goods?"
                                 options={Options.needsTransportationOptions}
-                                value={false}
+                                value='false'
                                 onChange={this.transportationNeededChanged}
                                 required
                                 rowClassName="addMargin"
diff --git a/src/DonationForm/lib/options.js b/src/DonationForm/lib/options.js
index 093fd98..5dc48ba 100644
--- a/src/DonationForm/lib/options.js
+++ b/src/DonationForm/lib/options.js
@@ -5,8 +5,8 @@ const organizationTypeOptions = [
 ]
 
 const needsTransportationOptions = [
-  {value: false, label: 'No'},
-  {value: true, label: 'Yes'}
+  {value: 'false', label: 'No'},
+  {value: 'true', label: 'Yes'}
 ]
 
 const donationCategoriesOptions = [
diff --git a/src/Layout/components/footer.js b/src/Layout/components/footer.js
index 45b738a..54f9082 100644
--- a/src/Layout/components/footer.js
+++ b/src/Layout/components/footer.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
 
 export default class ThankYou extends Component {
   render() {
diff --git a/src/Layout/components/header.js b/src/Layout/components/header.js
index 359b6b4..8e83b74 100644
--- a/src/Layout/components/header.js
+++ b/src/Layout/components/header.js
@@ -1,34 +1,34 @@
-import React, { Component } from 'react';
+import React  from 'react';
 import { Link } from 'react-router-dom';
-import {
-  Navbar,
-  Nav,
-  NavItem
-} from 'react-bootstrap'
+import { LinkContainer } from 'react-router-bootstrap';
+import { Navbar, Nav, NavItem } from 'react-bootstrap'
 
-export default class ThankYou extends Component {
-
-  render() {
-    return(
-      <Navbar collapseOnSelect>
-        <Navbar.Brand>
-          <Link to='/'>Home</Link>
-        </Navbar.Brand>
-        <Navbar.Toggle />
-        <Navbar.Collapse>
+export default function Header() {
+  return(
+    <Navbar collapseOnSelect>
+      <Navbar.Brand>
+        <Link to='/'>Home</Link>
+      </Navbar.Brand>
+      <Navbar.Toggle />
+      <Navbar.Collapse>
         <Nav bsStyle="pills">
-          <li role="presentation">
-            <Link eventKey={1} to='/donation-form'>Donation form link</Link>
-          </li>
-          <li role="presentation">
-            <Link eventKey={2} to='/donation-form/thank-you'>Thank You page link</Link>
-          </li>
-            <li role="presentation">
-                <Link eventKey={3} to='/search'>Search page link</Link>
-            </li>
+          <LinkContainer exact to='/donation-form'>
+            <NavItem eventKey={1}>
+              Donation form link
+            </NavItem>
+          </LinkContainer>
+          <LinkContainer exact to='/donation-form/thank-you'>
+            <NavItem eventKey={2}>
+              Thank You page link
+            </NavItem>
+          </LinkContainer>
+          <LinkContainer to='/search'>
+            <NavItem eventKey={3}>
+              Search page link
+            </NavItem>
+          </LinkContainer>
         </Nav>
-        </Navbar.Collapse>
-      </Navbar>
-    )
-  }
+      </Navbar.Collapse>
+    </Navbar>
+  );
 }
diff --git a/src/Layout/layout.js b/src/Layout/layout.js
index 170935c..373ca8f 100644
--- a/src/Layout/layout.js
+++ b/src/Layout/layout.js
@@ -1,20 +1,13 @@
-import React, { Component } from 'react';
+import React  from 'react';
 import Header from './components/header.js'
 import Footer from './components/footer.js'
 
-export default class Layout extends Component {
-
-  constructor() {
-    super()
-  }
-
-  render() {
-    return (
-      <div>
-        <Header/>
-          {this.props.children}
-        <Footer/>
-      </div>
-    )
-  }
+export default function Layout({ children }) {
+  return (
+    <div>
+      <Header/>
+        {children}
+      <Footer/>
+    </div>
+  );
 }
diff --git a/src/Search/components/search.js b/src/Search/components/search.js
index 15b9453..47cd8e5 100644
--- a/src/Search/components/search.js
+++ b/src/Search/components/search.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import client from '../../Feathers';
+import uuid from 'node-uuid';
 
 export default class Search extends Component {
     constructor() {
@@ -34,7 +35,7 @@ export default class Search extends Component {
     }
 
     render() {
-        let results = [(<p>No results.</p>)];
+        let results = [(<p key={uuid.v4()}>No results.</p>)];
         if (this.state.results.length) {
             results = this.state.results.map((result) => {
                 let resultText = '';
diff --git a/src/ThankYou/components/thankYou.js b/src/ThankYou/components/thankYou.js
index ed1732a..c4b5f27 100644
--- a/src/ThankYou/components/thankYou.js
+++ b/src/ThankYou/components/thankYou.js
@@ -1,14 +1,12 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
-export default class ThankYou extends Component {
-    render() {
-        return (
-            <div>
-                <h1>Thank You Page Under Construction</h1>
-                <Link to='/'>Landing page link</Link>
-                <Link to='/donation-form'>Donation form link</Link>
-            </div>
-        )
-    }
+export default function ThankYou() {
+    return (
+        <div>
+            <h1>Thank You Page Under Construction</h1>
+            <Link to='/'>Landing page link</Link>
+            <Link to='/donation-form'>Donation form link</Link>
+        </div>
+    );
 }
diff --git a/yarn.lock b/yarn.lock
index 392c2b0..fcdd538 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4483,6 +4483,10 @@ node-status-codes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
 
+node-uuid@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -5404,6 +5408,12 @@ react-prop-types@^0.4.0:
   dependencies:
     warning "^3.0.0"
 
+react-router-bootstrap@^0.24.4:
+  version "0.24.4"
+  resolved "https://registry.yarnpkg.com/react-router-bootstrap/-/react-router-bootstrap-0.24.4.tgz#6e89481d8a8979649a0dd4535e4a68df4a3d0b12"
+  dependencies:
+    prop-types "^15.5.10"
+
 react-router-dom@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d"

From 9c922f23e36e498634fa110e9e7a987fb1a962f8 Mon Sep 17 00:00:00 2001
From: Sammy Rivera <samuel.rivera@infoscoutinc.com>
Date: Fri, 6 Oct 2017 00:14:40 -0700
Subject: [PATCH 3/4] Removed unnecessary withRouter from header.js. Using
 LinkContainer will not require onClick handler Removed duplicated prop type
 for Submit button [login.js] Removed unnecessary dependency

---
 package.json                    | 1 -
 src/Layout/components/header.js | 6 ++----
 src/Search/components/login.js  | 2 +-
 src/Search/components/search.js | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 4ba653b..19654c5 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "feathers-socketio": "^2.0.0",
     "formsy-react": "^1.0.0",
     "formsy-react-components": "^1.0.0-alpha.5",
-    "node-uuid": "^1.4.8",
     "localstorage-memory": "^1.0.2",
     "query-string": "^5.0.0",
     "react": "^15.6.1",
diff --git a/src/Layout/components/header.js b/src/Layout/components/header.js
index 5feb95a..0ffd1f4 100644
--- a/src/Layout/components/header.js
+++ b/src/Layout/components/header.js
@@ -1,5 +1,5 @@
 import React  from 'react';
-import { Link, withRouter } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { Navbar, Nav, NavItem } from 'react-bootstrap';
 import { LinkContainer } from 'react-router-bootstrap';
 import branding from '../../brandingConfig';
@@ -29,6 +29,4 @@ export default function Header() {
       </Navbar.Collapse>
     </Navbar>
   );
-}
-
-export default withRouter(Header);
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Search/components/login.js b/src/Search/components/login.js
index 7f04acc..a611bec 100644
--- a/src/Search/components/login.js
+++ b/src/Search/components/login.js
@@ -80,7 +80,7 @@ class Login extends Component {
                             labelClassName={[{'col-sm-3': false}, 'col-md-2 col-md-offset-2']}
                             elementWrapperClassName={[{'col-sm-9': false}, 'col-md-6 col-xs-12']}
                         />
-                        <Button type="submit" disabled={!this.state.canSubmit} className="col-xs-12 col-md-6 col-md-offset-3 btn-donate" type="submit" bsSize="large">
+                        <Button type="submit" disabled={!this.state.canSubmit} className="col-xs-12 col-md-6 col-md-offset-3 btn-donate"  bsSize="large">
                             Submit
                         </Button>
                     </Form>
diff --git a/src/Search/components/search.js b/src/Search/components/search.js
index 8b593df..b2228e8 100644
--- a/src/Search/components/search.js
+++ b/src/Search/components/search.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import client from '../../Feathers';
-import uuid from 'node-uuid';
 import SearchForm from './searchForm';
 import Login from './login';
 import './search.css';

From 92a7ae7b552395a0a2fb4a21905eb84a3af48841 Mon Sep 17 00:00:00 2001
From: Sammy Rivera <samuel.rivera@infoscoutinc.com>
Date: Fri, 6 Oct 2017 00:21:42 -0700
Subject: [PATCH 4/4] Footer component is now a functional component

---
 src/App.css                     |  2 +-
 src/Layout/components/footer.js | 28 +++++++++++++---------------
 src/Layout/layout.js            |  6 +++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/App.css b/src/App.css
index 6bbf36d..f0e982b 100644
--- a/src/App.css
+++ b/src/App.css
@@ -82,7 +82,7 @@
 /* END Navbar Styles */
 
 /* START Footer Styles */
-footer{
+.footer{
     padding-top: 35px;
     padding-bottom: 35px;
     background-color: #2a2730;
diff --git a/src/Layout/components/footer.js b/src/Layout/components/footer.js
index 54e5091..d66b5b5 100644
--- a/src/Layout/components/footer.js
+++ b/src/Layout/components/footer.js
@@ -1,22 +1,20 @@
-import React, { Component } from 'react';
+import React from 'react';
 import {
   Grid,
   Row,
   Col
 } from 'react-bootstrap';
 
-export default class subFooter extends Component {
-  render() {
-    return(
-      <footer className='footer'>
-        <Grid>
-          <Row className="subFooter">
-            <Col xs={12} className="text-center">
-              <p>Powered by DonDB</p>
-            </Col>
-          </Row>
-        </Grid>
-      </footer>
-    )
-  }
+export default function Footer() {
+  return (
+    <div className='footer'>
+      <Grid>
+        <Row className="subFooter">
+          <Col xs={12} className="text-center">
+            <p>Powered by DonDB</p>
+          </Col>
+        </Row>
+      </Grid>
+    </div>
+  );
 }
diff --git a/src/Layout/layout.js b/src/Layout/layout.js
index 8819d37..2b3844d 100644
--- a/src/Layout/layout.js
+++ b/src/Layout/layout.js
@@ -7,10 +7,10 @@ export default function Layout({ children }) {
   return (
     <div className='layout'>
       <div className='full-height'>
-        <Header/>
+        { Header() }
         { children }
       </div>
-      <Footer/>
+      { Footer() }
     </div>
   );
-}
+}
\ No newline at end of file