Skip to content

Commit 1ae9900

Browse files
authored
Merge pull request #222 from goodgoof/feature/#159221467
Feature/#159221467
2 parents 775fa1a + 7db6202 commit 1ae9900

File tree

8 files changed

+1680
-2683
lines changed

8 files changed

+1680
-2683
lines changed

client/App.js

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class App extends Component {
6262
<Route path='/landing-f' component={Footer} />
6363
<Route path='/landing-e' component={LandingE} />
6464
<Route path='/landing-d' component={LandingD} />
65+
<Route path='/landing-f' component={Footer} />
6566
<Route path='/show-applications' component={ApplicationsRestrictedLoadable} />
6667
<Route path='/projects/:id' component={ProjectDetail} />
6768
</Switch>

client/components/Applications/ApplicationsList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
44
import ApplicationActionCreator from '../../actions/application/'
55

66
class ApplicationsList extends Component {
7-
componentWillReceiveProps (nextProps) {
7+
UnsafeComponentWillReceiveProps (nextProps) {
88
this._markAsSeenApplications(nextProps.applications)
99
}
1010

client/components/Home/Home.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Home extends Component {
3232
this.props.onLoad()
3333
}
3434

35-
componentWillReceiveProps = (nextProps) => {
35+
UnsafeComponentWillReceiveProps = (nextProps) => {
3636
if (this.props.projects !== nextProps.projects) {
3737
this.setState({filteredProjects: nextProps.projects})
3838
}

client/components/LandingE/LandingE.scss

+32
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ $white: #fff;
1616
img {
1717
vertical-align: middle;
1818
}
19+
1920
h1 {
2021
color: $white;
2122
text-align: center;
@@ -50,6 +51,36 @@ a.slack {
5051
}
5152
}
5253

54+
.slack{
55+
margin-top:-15px;
56+
font-size: 30px;
57+
}
58+
59+
.slack, .github {
60+
width: 369px;
61+
height: 75px;
62+
border-radius: 49.5px;
63+
64+
&:active,
65+
&:hover,
66+
&:focus {
67+
background: $white;
68+
}
69+
}
70+
71+
a.slack {
72+
background: $white;
73+
width: 369px;
74+
height: 75px;
75+
border-radius: 49.5px;
76+
77+
&:active,
78+
&:hover,
79+
&:focus {
80+
background: $white;
81+
}
82+
}
83+
5384
.slack{
5485
margin-top:-15px;
5586
}
@@ -80,4 +111,5 @@ a.slack {
80111
text-align: left;
81112
color: #000000;
82113
padding-left: 10px;
114+
color: #000000
83115
}

client/components/Restricted/Restricted.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function (BaseComponent) {
1212
this.checkAuthentication(this.props)
1313
}
1414

15-
componentWillReceiveProps (nextProps) {
15+
UnsafeComponentWillReceiveProps (nextProps) {
1616
if (nextProps.location !== this.props.location) {
1717
this.checkAuthentication(nextProps)
1818
}

client/components/Version/Version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Version () {
55
const {NODE_ENV, COMMIT_HASH} = $_ENV
66

77
const version = NODE_ENV === 'test'
8-
? <a href={`https://github.com/CodeForSocialGood/calltocode.org/tree/${COMMIT_HASH}`} target='_blank'>v{COMMIT_HASH}</a>
8+
? <a href={`https://github.com/CodeForSocialGood/calltocode.org/tree/${COMMIT_HASH}`} target='_blank' rel="noopener noreferrer">v{COMMIT_HASH}</a>
99
: null
1010

1111
return (

client/images/group-12.png

26 KB
Loading

0 commit comments

Comments
 (0)