Merge pull request #222 from goodgoof/feature/#159221467

Feature/#159221467
CodeForSocialGood · Jul 26, 2018 · 1ae9900 · 1ae9900
2 parents 775fa1a + 7db6202
commit 1ae9900
Show file tree

Hide file tree

Showing 8 changed files with 1,680 additions and 2,683 deletions.
diff --git a/client/App.js b/client/App.js
@@ -62,6 +62,7 @@ class App extends Component {
           <Route path='/landing-f' component={Footer} />
           <Route path='/landing-e' component={LandingE} />
           <Route path='/landing-d' component={LandingD} />
+          <Route path='/landing-f' component={Footer} />
           <Route path='/show-applications' component={ApplicationsRestrictedLoadable} />
           <Route path='/projects/:id' component={ProjectDetail} />
         </Switch>

diff --git a/client/components/Applications/ApplicationsList.js b/client/components/Applications/ApplicationsList.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import ApplicationActionCreator from '../../actions/application/'
 
 class ApplicationsList extends Component {
-  componentWillReceiveProps (nextProps) {
+  UnsafeComponentWillReceiveProps (nextProps) {
     this._markAsSeenApplications(nextProps.applications)
   }
 

diff --git a/client/components/Home/Home.js b/client/components/Home/Home.js
@@ -32,7 +32,7 @@ class Home extends Component {
     this.props.onLoad()
   }
 
-  componentWillReceiveProps = (nextProps) => {
+  UnsafeComponentWillReceiveProps = (nextProps) => {
     if (this.props.projects !== nextProps.projects) {
       this.setState({filteredProjects: nextProps.projects})
     }

diff --git a/client/components/LandingE/LandingE.scss b/client/components/LandingE/LandingE.scss
@@ -16,6 +16,7 @@ $white: #fff;
 img {
   vertical-align: middle;
 }
+
 h1 {
   color: $white;
   text-align: center;
@@ -50,6 +51,36 @@ a.slack {
   }
 }
 
+.slack{
+  margin-top:-15px;
+  font-size: 30px;
+}
+
+.slack, .github {
+  width: 369px;
+  height: 75px;
+  border-radius: 49.5px;
+
+  &:active,
+  &:hover,
+  &:focus {
+    background: $white;
+  }
+}
+
+a.slack {
+  background: $white;
+  width: 369px;
+  height: 75px;
+  border-radius: 49.5px;
+
+  &:active,
+  &:hover,
+  &:focus {
+    background: $white;
+  }
+}
+
 .slack{
   margin-top:-15px;
 }
@@ -80,4 +111,5 @@ a.slack {
   text-align: left;
   color: #000000;
   padding-left: 10px;
+  color: #000000
 }
diff --git a/client/components/Restricted/Restricted.js b/client/components/Restricted/Restricted.js
@@ -12,7 +12,7 @@ export default function (BaseComponent) {
       this.checkAuthentication(this.props)
     }
 
-    componentWillReceiveProps (nextProps) {
+    UnsafeComponentWillReceiveProps (nextProps) {
       if (nextProps.location !== this.props.location) {
         this.checkAuthentication(nextProps)
       }

diff --git a/client/components/Version/Version.js b/client/components/Version/Version.js
@@ -5,7 +5,7 @@ function Version () {
   const {NODE_ENV, COMMIT_HASH} = $_ENV
 
   const version = NODE_ENV === 'test'
-    ? <a href={`https://github.com/CodeForSocialGood/calltocode.org/tree/${COMMIT_HASH}`} target='_blank'>v{COMMIT_HASH}</a>
+    ? <a href={`https://github.com/CodeForSocialGood/calltocode.org/tree/${COMMIT_HASH}`} target='_blank' rel="noopener noreferrer">v{COMMIT_HASH}</a>
     : null
 
   return (

diff --git a/client/images/group-12.png b/client/images/group-12.png