Skip to content

Commit fea72df

Browse files
ianroberts131bbmoz
authored andcommitted
Feature: Add About Page [#151016375] (#155)
* Feature: Add About Page [#151016375] * mary notifs - initial commit * create application create a new application when applying to a project. * fix lint * remove white space * mark as seen applications * show application info
1 parent 958b329 commit fea72df

File tree

7 files changed

+60
-4
lines changed

7 files changed

+60
-4
lines changed

.git-authors

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pairs:
1616
md: Michael Donal; michaelbretagne
1717
ch: Christina Hsieh
1818
sm: Sergio Monteiro
19+
ir: Ian Roberts
1920

2021
email:
2122
prefix: pair
@@ -26,3 +27,4 @@ email_addresses:
2627
2728
2829
30+

client/App.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import AuthActionCreator from './actions/auth'
99
import ForgotPasswordForm from './components/ForgotPasswordForm/ForgotPasswordForm'
1010
import Header from './components/Header/Header'
1111
import Home from './components/Home/Home'
12+
import About from './components/About/About'
1213
import LoginForm from './components/LoginForm/LoginForm'
1314
import restricted from './components/Restricted/Restricted'
1415
import SignupForm from './components/SignupForm/SignupForm'
@@ -44,6 +45,7 @@ class App extends Component {
4445
<Version />
4546
<Switch>
4647
<Route exact path='/' component={Home}/>
48+
<Route path='/about' component={About}/>
4749
<Route path='/create-project' component={CreateProjectRestrictedLoadable}/>
4850
<Route path='/forgot-password' component={ForgotPasswordForm}/>
4951
<Route path='/login' component={LoginForm}/>

client/components/About/About.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import React, { Component } from 'react'
2+
3+
import styles from './About.scss'
4+
5+
class About extends Component {
6+
render () {
7+
return (
8+
<section className={styles.aboutSection}>
9+
<h1>Contact</h1>
10+
<p className={styles.aboutItem}>
11+
<span className={styles.aboutItemTitle}>Email: </span>
12+
<span>
13+
<a href="mailto:[email protected]">
14+
15+
</a>
16+
</span>
17+
</p>
18+
<p className={styles.aboutItem}>
19+
<span className={styles.aboutItemTitle}>Slack Channel: </span>
20+
<span>
21+
<a href="http://join-our-slack.code4socialgood.org">
22+
call-to-code-info
23+
</a>
24+
</span>
25+
</p>
26+
<h1>Mission Statement</h1>
27+
<p>
28+
A platform where college students can get development experience by
29+
matching them with nonprofits, calltocode.org is a nonprofit and open-sourced
30+
product built by volunteers to accomplish a positive mission.
31+
</p>
32+
</section>
33+
)
34+
}
35+
}
36+
37+
export default About

client/components/About/About.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.aboutItem {
2+
margin-bottom: 10px;
3+
}
4+
5+
.aboutItemTitle {
6+
font-weight: 900;
7+
}
8+
9+
.aboutSection {
10+
padding: 0 60px;
11+
display: grid;
12+
}

client/components/Header/Header.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ class Header extends Component {
2121
}
2222

2323
componentDidMount () {
24-
this.props.getNotifications()
24+
if (this.props.authenticated) {
25+
this.props.getNotifications()
26+
}
2527
}
2628

2729
renderNotificationBadge () {
@@ -74,6 +76,7 @@ class Header extends Component {
7476
<Link to="/" className={styles.button}>calltocode</Link>
7577
</Typography>
7678
{this.renderHeaderButtons()}
79+
<Link key="about" to="/about" className={this.getLinkStyles('about')}>ABOUT</Link>
7780
</Toolbar>
7881
</AppBar>
7982
</div>

client/components/Home/Home.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ class Home extends Component {
7373
<section className={styles.filterSection}>
7474
<span className={styles.filterTitle}><h1>{'Filters'}</h1></span>
7575
<FormLabel className={styles.causeTitle}>Causes</FormLabel>
76-
<FormGroup column className={styles.causesList}>
76+
<FormGroup className={styles.causesList}>
7777
{ this.renderList(causes, 'causes') }
7878
</FormGroup>
7979
<FormLabel className={styles.techTitle}>Tech</FormLabel>
80-
<FormGroup column className={styles.techList}>
80+
<FormGroup className={styles.techList}>
8181
{ this.renderList(technologies, 'technologies') }
8282
</FormGroup>
8383
</section>

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3228,7 +3228,7 @@ es6-error@^4.0.1, es6-error@^4.0.2, es6-error@^4.1.1:
32283228
version "4.1.1"
32293229
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
32303230

3231-
es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
3231+
es6-iterator@^2.0.1, es6-iterator@~2.0.1:
32323232
version "2.0.3"
32333233
resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
32343234
dependencies:

0 commit comments

Comments
 (0)