Osprey landing page and styling #632

Merged
daovist merged 6 commits from multisite-styling into master 2018-10-15 19:42:36 +02:00
2 changed files with 15 additions and 12 deletions
Showing only changes of commit ba49aff9c5 - Show all commits

View file

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

View file

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