Skip to content

Commit

Permalink
Merge pull request #164 from Say-Their-Name/feature/contribution-link…
Browse files Browse the repository at this point in the history
…s-footer

Added contribution footer for github and slack links.
  • Loading branch information
Easybuoy committed Aug 17, 2020
2 parents 88968d8 + 1ab60b3 commit 750bbab
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ REACT_APP_NEWS_FETCH_PROXY=REACT_APP_NEWS_FETCH_PROXY
REACT_APP_TWITTER_URL=REACT_APP_TWITTER_URL
REACT_APP_FACEBOOK_URL=REACT_APP_FACEBOOK_URL
REACT_APP_INSTAGRAM_URL=REACT_APP_INSTAGRAM_URL
REACT_APP_GITHUB_URL=REACT_APP_GITHUB_URL
REACT_APP_SLACK_URL=REACT_APP_SLACK_URL
REACT_APP_ANDROID_URL=REACT_APP_ANDROID_URL
REACT_APP_IOS_URL=REACT_APP_IOS_URL
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ REACT_APP_NEWS_FETCH_PROXY=https://thingproxy.freeboard.io/fetch
REACT_APP_TWITTER_URL=https://twitter.com/SayTheirName_io
REACT_APP_FACEBOOK_URL=https://www.facebook.com/Say-Their-Names-108926117523025/?modal=admin_todo_tour
REACT_APP_INSTAGRAM_URL=https://www.instagram.com/saytheirname.io
REACT_APP_GITHUB_URL=https://github.com/Say-Their-Name
REACT_APP_SLACK_URL=https://app.slack.com/client/T014JL5B3SN/C014X92G997
REACT_APP_ANDROID_URL=https://play.google.com/store/apps/details?id=io.saytheirnames.android
REACT_APP_IOS_URL=https://apps.apple.com/app/say-their-names/id1517599626
```
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test:all": "yarn run lint:fix && CI=true yarn test",
"test:coverage": "CI=true yarn test --coverage --watchAll=false",
"test:all": "yarn run lint:fix && yarn test --CI=true",
"test:coverage": "yarn test --coverage --watchAll=false --CI=true",
"eject": "react-scripts eject",
"lint": "eslint src",
"lint:fix": "eslint src --fix"
Expand Down
4 changes: 4 additions & 0 deletions src/assets/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/slack.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions src/components/footer/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import Apple from '../../assets/AppStorebadge.svg';
import Twitter from '../../assets/twitter.svg';
import Facebook from '../../assets/facebook.svg';
import Instagram from '../../assets/instagram.svg';
import Github from '../../assets/github.svg';
import Slack from '../../assets/slack.svg';
import Variables from '../../constants/Variables';

import {
Expand Down Expand Up @@ -89,6 +91,24 @@ const Footer = () => (
>
<img src={Instagram} alt="instagram-handle" />
</a>
<br />
<h2>CONTRIBUTE</h2>
<a
style={{ marginTop: '1rem', textDecoration: 'none' }}
target="_blank"
rel="noopener noreferrer"
href={Variables.GITHUB_URL}
>
<img src={Github} alt="github-handle" />
</a>
<a
style={{ marginTop: '1rem', textDecoration: 'none' }}
target="_blank"
rel="noopener noreferrer"
href={Variables.SLACK_URL}
>
<img src={Slack} alt="slack-handle" />
</a>
</StyledFooter>
</FooterContainer>
</Container>
Expand Down
1 change: 1 addition & 0 deletions src/components/footer/Footer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('<Footer />', () => {
expect(getByText('Our Mission'));
// expect(getByText('DOWNLOADS (Coming shortly)'));
expect(getByText('JOIN US ON SOCIAL MEDIA'));
expect(getByText('CONTRIBUTE'));
});

test('renders correct links', () => {
Expand Down
4 changes: 4 additions & 0 deletions src/constants/Variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ const {
REACT_APP_TWITTER_URL,
REACT_APP_FACEBOOK_URL,
REACT_APP_INSTAGRAM_URL,
REACT_APP_GITHUB_URL,
REACT_APP_SLACK_URL,
REACT_APP_ANDROID_URL,
REACT_APP_IOS_URL
} = process.env;
Expand All @@ -10,6 +12,8 @@ export default {
TWITTER_URL: REACT_APP_TWITTER_URL,
FACEBOOK_URL: REACT_APP_FACEBOOK_URL,
INSTAGRAM_URL: REACT_APP_INSTAGRAM_URL,
GITHUB_URL: REACT_APP_GITHUB_URL,
SLACK_URL: REACT_APP_SLACK_URL,
ANDROID_URL: REACT_APP_ANDROID_URL,
IOS_URL: REACT_APP_IOS_URL
};

0 comments on commit 750bbab

Please sign in to comment.