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

Osprey landing page and styling #632

Merged
daovist merged 6 commits from multisite-styling into master 2018-10-15 19:42:36 +02:00
Conversation 0 Commits 6 Files changed 6 +15 -12
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ba49aff9c5 - Show all commits

9
client/src/pages/ShowChannel/index.js
View file

@ -1,19 +1,20 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import View from './view'; import View from './view';
const mapStateToProps = ({ show }) => { const mapStateToProps = ({ show, site, channel }) => {
// select request info // select request info
const requestId = show.request.id; const requestId = show.request.id;
// select request // select request
const previousRequest = show.requestList[requestId] || null; const previousRequest = show.requestList[requestId] || null;
// select channel // select channel
let channel; let thisChannel;
if (previousRequest) { if (previousRequest) {
const channelKey = previousRequest.key; const channelKey = previousRequest.key;
channel = show.channelList[channelKey] || null; thisChannel = show.channelList[channelKey] || null;
} }
return { return {
channel, channel : thisChannel,
homeChannel: site.publishOnlyApproved && !channel.loggedInChannel.name ? `${site.approvedChannels[0].name}:${site.approvedChannels[0].longId}` : null,
}; };
}; };

18
client/src/pages/ShowChannel/view.jsx
View file

@ -7,7 +7,7 @@ import Row from '@components/Row';
class ShowChannel extends React.Component { class ShowChannel extends React.Component {
render () { render () {
const { channel } = this.props; const { channel, homeChannel } = this.props;
if (channel) { if (channel) {
const { name, longId, shortId } = channel; const { name, longId, shortId } = channel;
return ( return (
@ -15,13 +15,15 @@ class ShowChannel extends React.Component {
pageTitle={name} pageTitle={name}
channel={channel} channel={channel}
> >
<Row> {!homeChannel && (
<ChannelInfoDisplay <Row>
name={name} <ChannelInfoDisplay
longId={longId} name={name}
shortId={shortId} longId={longId}
/> shortId={shortId}
</Row> />
</Row>
)}
<ChannelClaimsDisplay /> <ChannelClaimsDisplay />
</PageLayout> </PageLayout>
); );