Skip to content

Commit

Permalink
Merge pull request #114 from sickpig/new/add-contact-us
Browse files Browse the repository at this point in the history
Add "Contact Us" page
  • Loading branch information
sickpig authored Apr 3, 2017
2 parents 274d606 + 9c6b0d1 commit 2ae6d59
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
"proposals": "Proposals",
"members": "Members",
"resources": "Resources",
"conference": "Conferences"
"conference": "Conferences",
"contactus": "Contact Us"
},
"footer": {
"latest": "Our Latest Work",
Expand All @@ -137,6 +138,7 @@
"members": "Members",
"resources": "Resources",
"conferences": "Conferences",
"contactus": "Contact Us",
"join": "Join Us",
"forum": "The Bitcoin Forum",
"reddit1": "Reddit /r/btc",
Expand Down
2 changes: 1 addition & 1 deletion src/public/css/main-orange.css
Original file line number Diff line number Diff line change
Expand Up @@ -2291,7 +2291,7 @@ background-image: url(../img/homepage-slider/Blockchain.png);
.mainmenu > ul > li > a,
.mainmenu .mainmenu-submenu-inner > li > a {
font-size: 1.2em;
padding: 1em 0em 1em 1.5em;
padding: 1em 0em 1em 1.2em;
color: #999;
display: inline-block;
text-decoration: none;
Expand Down
Binary file added src/public/img/plato-aristotle.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/public/views/footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ export default React.createClass({
<li>
<Link to='/conferences'>{strings().footer.conferences}</Link>
</li>
<li>
<Link to='/contact-us'>{strings().footer.contactus}</Link>
</li>
</ul>
</div>
<div className="col-footer col-md-4 col-xs-6">
Expand All @@ -79,6 +82,9 @@ export default React.createClass({
<li>
<a href="https://webchat.freenode.net/?channels=#btc">{strings().footer.irc}</a>
</li>
<li>
<a href="mail:[email protected]">Report Security Issue</a>
</li>
</p>
</div>
<div className="col-footer col-md-2 col-xs-6">
Expand Down
6 changes: 3 additions & 3 deletions src/public/views/header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ export default React.createClass({
<img src='/img/bitcoin-unlimited.png' width='98%' height='100%' />
</Link>
</li>
<li className={this.getClassName('index')}>
<Link to='/'>{strings().header.home}</Link>
</li>
<li className={this.getClassName('download')}>
<Link to='/download'>{strings().header.download}</Link>
</li>
Expand All @@ -44,6 +41,9 @@ export default React.createClass({
<li className={this.getClassName('conference')}>
<Link to='/conferences'>{strings().header.conference}</Link>
</li>
<li className={this.getClassName('contact-us')}>
<Link to='/contact-us'>{strings().header.contactus}</Link>
</li>
</ul>
</nav>
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/public/views/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import EmergentConsensus from './pages/emergent-consensus.jsx';
import NotFound from './pages/not-found.jsx';
import Conferences from './pages/conferences.jsx';
import Donate from './pages/donate.jsx';
import ContactUs from './pages/contact-us.jsx';

ReactDOM.render((
<Router history={createHistory()}>
Expand All @@ -33,6 +34,7 @@ ReactDOM.render((
<Route path='donate' component={Donate} />
<Route path='emergent-consensusBU' component={EmergentConsensusBU} />
<Route path='emergent-consensus' component={EmergentConsensus} />
<Route path='contact-us' component={ContactUs} />
<Route path='*' component={NotFound} />
</Route>
</Router>
Expand Down
58 changes: 58 additions & 0 deletions src/public/views/pages/contact-us.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
'use strict';

import React from 'react';

import Header from '../header.jsx';
import Footer from '../footer.jsx';
import { strings } from '../../lib/i18n';
import Title from '../components/title.jsx';

export default React.createClass({

render: function() {
return (
<div id='contactus'>
<Header active='contact-us' />
<Title title='Contact Us' />
<div className='section'>
<div className='container'>
<div className='row service-wrapper-row'>
<div className='col-sm-4'>
<div className='service-image'>
<img src='/img/plato-aristotle.jpg' alt='Agora' />
</div>
</div>
<div className='col-sm-8'>
<h2 className='green'>Get in contact</h2>
<p>
BitcoinUnlimited.info website does not provide general support on the BU projects, to get general support please have a look at these resources:
</p>
<ul>
<li>
<a href="https://www.bitco.in/forum">{strings().footer.forum}</a>
</li>
<li>
<a href="https://reddit.com/r/btc">{strings().footer.reddit1}</a>
</li>
<li>
<a href="https://reddit.com/r/bitcoin_unlimited">{strings().footer.reddit2}</a>
</li>
<li>
<a href="mailto:[email protected]?subject=Bitcoin%20Unlimited%20Slack%20Invite&body=Hi%21%0D%0A%0D%0ACould%20you%20please%20invite%20me%20to%20the%20Bitcoin%20Unlimited%20Slack%20group%3F%20My%20email%20address%20is%20%5BINSERT%20EMAIL%20ADDRESS%20HERE%5D.%0D%0A%0D%0AThank%20you%21">{strings().footer.slack}</a>
</li>
<li>
<a href="https://webchat.freenode.net/?channels=#btc">{strings().footer.irc}</a>
</li>
<li><a href='https://github.com/BitcoinUnlimited/BitcoinUnlimited/issues'>Issues Tracker</a></li>
</ul>
<p>To report about security issues, please use this email <a href="mailto:[email protected]">[email protected]</a> (don't use it for generic enquires).</p>
</div>
</div>
</div>
</div>
<Footer />
</div>
);
}

});

0 comments on commit 2ae6d59

Please sign in to comment.