LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

updated nav bar to accept custom site description #396

Merged
bones7242 merged 1 commit from speech-as-a-package-custom-tag-line into speech-as-a-package 2018-03-16 01:58:39 +01:00
Conversation 0 Commits 1 Files changed 6 +10 -8
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.js
View file

File diff suppressed because one or more lines are too long

2
index.js.map
View file

File diff suppressed because one or more lines are too long

4
public/bundle/bundle.js
View file

File diff suppressed because one or more lines are too long

2
public/bundle/bundle.js.map
View file

File diff suppressed because one or more lines are too long

5
react/containers/NavBar/index.js
View file

@ -1,13 +1,14 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { updateLoggedInChannel } from 'actions/channel'; import { updateLoggedInChannel } from 'actions/channel';
import {updateSelectedChannel} from 'actions/publish';
import View from './view'; import View from './view';
import {updateSelectedChannel} from '../../actions/publish';
const mapStateToProps = ({ channel }) => { const mapStateToProps = ({ channel, site }) => {
return { return {
channelName : channel.loggedInChannel.name, channelName : channel.loggedInChannel.name,
channelShortId: channel.loggedInChannel.shortId, channelShortId: channel.loggedInChannel.shortId,
channelLongId : channel.loggedInChannel.longId, channelLongId : channel.loggedInChannel.longId,
siteDescription: site.description,
}; };
}; };

3
react/containers/NavBar/view.jsx
View file

@ -53,12 +53,13 @@ class NavBar extends React.Component {
} }
} }
render () { render () {
const { siteDescription } = this.props;
return ( return (
<div className='row row--wide nav-bar'> <div className='row row--wide nav-bar'>
<div className='row row--padded row--short flex-container--row flex-container--space-between-center'> <div className='row row--padded row--short flex-container--row flex-container--space-between-center'>
<Logo /> <Logo />
<div className='nav-bar--center'> <div className='nav-bar--center'>
<span className='nav-bar-tagline'>Open-source, decentralized image and video sharing.</span> <span className='nav-bar-tagline'>{siteDescription}</span>
</div> </div>
<div className='nav-bar--right'> <div className='nav-bar--right'>
<NavLink className='nav-bar-link link--nav' activeClassName='link--nav-active' to='/' exact>Publish</NavLink> <NavLink className='nav-bar-link link--nav' activeClassName='link--nav-active' to='/' exact>Publish</NavLink>